querysub 0.233.0 → 0.235.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.233.0",
+  "version": "0.235.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",
@@ -22,7 +22,7 @@
     "js-sha512": "^0.9.0",
     "node-forge": "https://github.com/sliftist/forge#e618181b469b07bdc70b968b0391beb8ef5fecd6",
     "pako": "^2.1.0",
-    "socket-function": "^0.132.0",
+    "socket-function": "^0.133.0",
     "terser": "^5.31.0",
     "typesafecss": "^0.22.0",
     "yaml": "^2.5.0",

package/src/deployManager/spec.txt

@@ -1,35 +1,52 @@
-7) More graceful shutdown of services
-    - In some way communicate that we should shut down?
-    - ACTUALLY, we just ctrl+c, which... we might catch right now?
-        - So we might need to use ctrl+c multiple times, and callback to kill the service?
-    
+todonext
+Hmm... so... a function that returns... all infinite polls, and states for them, and... a function which can disable infinite polls. Yep...
+    - Oh, and in socket-function, so we have to publish the changes...
+Then test it in test.ts
 
 7.1) Better infinite poll support in shutdown
     - Stop all loops
     - If any are running, wait (with timeout, same as with regular handlers), for them to finish
 
-4) Kill our testing server
+4) Destroy our testing digital ocean server
 
 5) Setup on our regular digital ocean server
     - Remove previous startup.sh, and crontab and kill existing tmux services
     - Setup all the services in the new UI
         - Copy from the previous startup.sh, running the same services
         - Changing the UI if anything is extremely annoying, but... I don't see how it would be...
+    tmux send-keys -t server1 "cd ~/cyoa && yarn server-public" Enter
+    tmux send-keys -t server2 "cd ~/cyoa && yarn server-public" Enter
+    tmux send-keys -t fnc "cd ~/cyoa && yarn function-public --verbosecalls" Enter
+    tmux send-keys -t http "cd ~/cyoa && yarn cyoa-public --verbosecalls" Enter
+    tmux send-keys -t watch "cd ~/cyoa && yarn gc-watch-public" Enter
+    tmux send-keys -t join "cd ~/cyoa && yarn join-public" Enter
 5) Verify the editor works
 
 6) Verify PathValueServer gracefully shutdowns, not losing any values (because it delays and flushes writes before shutting down, detecting the ctrl+c).
 
 
-7) Quick node removal on process crash or removal
-    Detect the nodeId of services (if they have one), and when the service dies, immediately remove "edgenodes/" file, and trigger an update of "edge-nodes-index.json"
-    - How? Damn it, I have no idea. Maybe... they can determine their screen from their pid and then write to their screen folder? That seems... the best way, even though it's extremely coupling.
+7) Quick node removal on process crash OR removal
+    - In the service, check our parent folder to see if we are in a screen (/machine-services/git/), and then write our nodeId to /machine-services/nodeId
+    - If we see a nodeId when we are removing a screen, or killing the service, then delete that nodeId from the nodeId directory (and call tellEveryoneNodesChanges)
 7.1) Verify this by killing a lot of services (the function runner?), by just poking it over and over, verifying the nodes are quickly deleted
 
 
 
 8) REIMPLEMENT yarn do-update functionality, with UI on the configuration page
+    OH, maybe... buttons for querysub, button for the main site, and then buttons on each service to update them!
+        YES, and then, a button to do all of that on each service, and a button to do that and on each service.
+        - So a lot of buttons. But only 2 components, one for all, and one for a specific service.
+    - Endpoints
+        - anyQuerysubUnsaved
+        - anyAppUnsaved
+        - querysubLatestHash
+        - appLatestHash (already have this)
+        - publish, add, commit, and push querysub (and update app package.json reference)
+        - add, commit and push app
+
     - On services list page, and individual service page
         - So... maybe the button a component
+        - MULTIPLE buttons, to just update the main site, just querysub, or both
     - Button to update on each service where the repoUrl === the repoUrl of the server
         - Only from a non-public server
     - ALSO, button to update all (that match repoUrl)

package/src/diagnostics/periodic.ts

@@ -1,4 +1,4 @@
-import { delay, runInfinitePoll, runInfinitePollCallAtStart } from "socket-function/src/batching";
+import { delay, runInfinitePoll, runInfinitePollCallAtStart, shutdownPolling } from "socket-function/src/batching";
 import { isNode, timeInMinute } from "socket-function/src/misc";
 import { logErrors, timeoutToError } from "../errors";
 import debugbreak from "debugbreak";
@@ -37,31 +37,29 @@ export async function shutdown() {
     console.log(red("Starting shutdown"));
     shuttingDown = true;
     const { authorityStorage } = await import("../0-path-value-core/pathValueCore");
-    for (let fnc of preshutdownHandlers) {
-        try {
-            await timeoutToError(timeInMinute, fnc(), () => new Error(`Preshutdown handler ${fnc.name} timed out`));
-        } catch (e) {
-            console.log(`Error on preshutdown handler ${fnc.name}`, e);
-        }
+    try {
+        await Promise.allSettled([
+            ...preshutdownHandlers,
+        ].map(fnc => timeoutToError(timeInMinute, fnc(), () => new Error(`Preshutdown handler ${fnc.name} timed out`))));
+    } catch (e) {
+        console.log(`Error on preshutdown handlers`, e);
     }
     try {
-        await authorityStorage.onShutdown();
-        await nodeDiscoveryShutdown();
+        await Promise.allSettled([
+            function authorityStorageShutdown() { return authorityStorage.onShutdown(); },
+            nodeDiscoveryShutdown,
+            shutdownPolling,
+            ...shutdownHandlers,
+        ].map(fnc => timeoutToError(timeInMinute, fnc(), () => new Error(`Shutdown handler ${fnc.name} timed out`))));
     } catch (e) {
         console.log("Error on shutdown", e);
     }
-    for (let fnc of shutdownHandlers) {
-        try {
-            await timeoutToError(timeInMinute, fnc(), () => new Error(`Shutdown handler ${fnc.name} timed out`));
-        } catch (e) {
-            console.log(`Error on shutdown handler ${fnc.name}`, e);
-        }
-    }
     // Wait to allow any logged errors to hopefully be written somewhere?
     await delay(2000);
     process.exit();
 }
 
+// IMPORTANT! Yarn detaches the processes, so they keep running when you ctrl+c, even though the shell shows back up. We can fix this by using `node -r ./node_modules/typenode/index.js ./test.ts`. However, it's probably fine, as we still run the shutdown code, it's just that the manager doesn't know if we've shutdown or not.
 if (isNode()) {
     let lineBuffer = "";
     process.stdin.on("data", data => {