querysub 0.228.0 → 0.230.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.228.0",
+  "version": "0.230.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/ServiceDetailPage.tsx

@@ -299,19 +299,22 @@ type ServiceConfig = ${serviceConfigType}
                                 )}
                             </div>
                             {hasError && (
-                                <div className={css.pad2(8, 4)}>
+                                <div
+                                    className={css.pad2(8, 4).button}
+                                    onClick={(e) => {
+                                        e.stopPropagation();
+                                        const key = `${machineId}-${selectedServiceId || ""}`;
+                                        const current = this.state.expandedErrors[key];
+                                        if (current) {
+                                            current.expanded = !current.expanded;
+                                        } else {
+                                            this.state.expandedErrors[key] = { expanded: true };
+                                        }
+                                    }}
+                                >
                                     <div
-                                        className={css.button.pad2(4, 8).bord2(0, 0, 10).hsl(0, 0, 80)}
-                                        onClick={(e) => {
-                                            e.stopPropagation();
-                                            const key = `${machineId}-${selectedServiceId || ""}`;
-                                            const current = this.state.expandedErrors[key];
-                                            if (current) {
-                                                current.expanded = !current.expanded;
-                                            } else {
-                                                this.state.expandedErrors[key] = { expanded: true };
-                                            }
-                                        }}>
+                                        className={css.pad2(4, 8).bord2(0, 0, 10).hsl(0, 0, 80)}
+                                    >
                                         {this.state.expandedErrors[`${machineId}-${selectedServiceId || ""}`]?.expanded ? "Hide Error ▲" : "Show Error ▼"}
                                     </div>
                                     {serviceInfo?.errorFromLastRun && this.state.expandedErrors[`${machineId}-${selectedServiceId || ""}`]?.expanded && (
@@ -466,6 +469,7 @@ type ServiceConfig = ${serviceConfigType}
                         theme: "vs-dark",
                         automaticLayout: true,
                         minimap: { enabled: false },
+                        wordWrap: "on",
                     });
 
                     // Listen for changes

package/src/deployManager/machineApplyMainCode.ts

@@ -170,10 +170,38 @@ const runScreenCommand = measureWrap(async function runScreenCommand(config: {
         await runPromise(`${prefix}tmux new -s ${screenName} -d`);
     } catch { }
     await runPromise(`${prefix}tmux send-keys -t ${screenName} 'echo "Updating running command at ${new Date().toISOString()}"' Enter`);
-    // Send ctrl+c to kill any running command
     await runPromise(`${prefix}tmux send-keys -t ${screenName} 'C-c' Enter`);
+    await delay(1000);
+
+    let screens = await getScreenState();
+    let screen = screens.find(x => x.screenName === screenName);
+    let pid = screen?.pid;
+    if (pid && await isScreenRunningProcess(pid)) {
+        // It doesn't want to die. Wait longer, but it it just won't die, kill the screen
+        console.warn(`Screen ${screenName} is not dying, giving it another 30 seconds`);
+        await delay(timeInSecond * 30);
+        if (pid && await isScreenRunningProcess(pid)) {
+            console.warn(`Screen ${screenName} is still running, killing it forcefully`);
+            await killScreen({ screenName });
+            if (pid && await isScreenRunningProcess(pid)) {
+                console.error(`I don't know what happened. The screen won't die. We can't do much else, I guess we'll just ignore it...`);
+            } else {
+                // Nested, to create the screen again.
+                await runScreenCommand({
+                    screenName,
+                    command: config.command,
+                    folder: config.folder,
+                });
+                return;
+            }
+        }
+    }
     await runPromise(`${prefix}tmux send-keys -t ${screenName} 'cd ${config.folder}' Enter`);
-    await runPromise(`${prefix}tmux send-keys -t ${screenName} '${config.command}' Enter`);
+    let command = `#!/bin/bash
+${config.command}
+`;
+    await fs.promises.writeFile(config.folder + "../command.sh", command);
+    await runPromise(`${prefix}tmux send-keys -t ${screenName} 'bash command.sh' Enter`);
 });
 const killScreen = measureWrap(async function killScreen(config: {
     screenName: string;

package/src/deployManager/spec.txt

@@ -7,21 +7,22 @@
         - So we might need to use ctrl+c multiple times, and callback to kill the service?
     
 
-4) Default the repoUrl and gitRef to the url and ref the server is running
-    - Accessed when we click create service
+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
 
 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...
+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.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
-
 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.