querysub 0.227.0 → 0.229.0

package/package.json

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

@@ -172,6 +172,36 @@ type ServiceConfig = ${serviceConfigType}
         sort(machines, x => -x.heartbeat);
 
         return <div className={css.vbox(16).fillWidth}>
+            <style>{`
+                @keyframes rainbow-slide {
+                    0% { background-position: 100% 100%; }
+                    100% { background-position: 0% 0%; }
+                }
+                .rainbow-flash {
+                    background: linear-gradient(-45deg, 
+                        hsl(0, 70%, 50%), 
+                        hsl(60, 70%, 50%), 
+                        hsl(120, 70%, 50%), 
+                        hsl(180, 70%, 50%), 
+                        hsl(240, 70%, 50%), 
+                        hsl(300, 70%, 50%), 
+                        hsl(0, 70%, 50%), 
+                        hsl(60, 70%, 50%), 
+                        hsl(120, 70%, 50%), 
+                        hsl(180, 70%, 50%)
+                    );
+                    background-size: 300% 300%;
+                    color: white;
+                    font-weight: bold;
+                    text-shadow: 
+                        3px 3px 6px rgba(0, 0, 0, 0.9),
+                        -3px -3px 6px rgba(0, 0, 0, 0.9),
+                        3px -3px 6px rgba(0, 0, 0, 0.9),
+                        -3px 3px 6px rgba(0, 0, 0, 0.9),
+                        0 0 12px rgba(0, 0, 0, 0.8);
+                    animation: rainbow-slide 3s linear infinite;
+                }
+            `}</style>
             <div className={css.vbox(4).fillWidth}>
                 <InputLabel
                     label="Title"
@@ -269,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 && (
@@ -313,7 +346,7 @@ type ServiceConfig = ${serviceConfigType}
                 <button className={css.pad2(12, 8).button.bord2(0, 0, 20).hsl(0, 0, 80)}
                     onClick={() => {
                         configT.parameters.poke = (configT.parameters.poke || 0) + 1;
-                        void this.updateUnsavedChanges(configT);
+                        void this.updateConfigSynced(configT);
                     }}>
                     Poke
                 </button>
@@ -352,8 +385,8 @@ type ServiceConfig = ${serviceConfigType}
                     </button>
                 </>}
 
-                {this.state.isSaving && <div className={css.pad2(12, 8).button.bord2(0, 0, 20).hsl(0, 0, 80)}>
-                    Deploying to servers...
+                {this.state.isSaving && <div className={css.pad2(12, 8).bord2(0, 0, 20) + " rainbow-flash"}>
+                    Deploying changes
                 </div>}
 
                 <div className={css.marginAuto}></div>
@@ -436,6 +469,7 @@ type ServiceConfig = ${serviceConfigType}
                         theme: "vs-dark",
                         automaticLayout: true,
                         minimap: { enabled: false },
+                        wordWrap: "on",
                     });
 
                     // Listen for changes

package/src/deployManager/machineApplyMainCode.ts

@@ -169,9 +169,29 @@ const runScreenCommand = measureWrap(async function runScreenCommand(config: {
         // Throw if it already exists
         await runPromise(`${prefix}tmux new -s ${screenName} -d`);
     } catch { }
-    await runPromise(`${prefix}tmux send-keys -t ${screenName} 'echo "Updating running command at $(date)"' Enter`);
-    // Send ctrl+c to kill any running command
+    await runPromise(`${prefix}tmux send-keys -t ${screenName} 'echo "Updating running command at ${new Date().toISOString()}"' Enter`);
     await runPromise(`${prefix}tmux send-keys -t ${screenName} 'C-c' Enter`);
+    await delay(1000);
+    if (await isScreenRunningProcess(screenName)) {
+        // 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 (await isScreenRunningProcess(screenName)) {
+            console.warn(`Screen ${screenName} is still running, killing it forcefully`);
+            await killScreen({ screenName });
+            if (await isScreenRunningProcess(screenName)) {
+                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`);
 });