querysub 0.385.0 → 0.386.0

package/package.json

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

@@ -22,6 +22,7 @@ import { RenderGitRefInfo, UpdateServiceButtons, bigEmoji, buttonStyle } from ".
 import { TypedConfigEditor } from "../../library-components/TypedConfigEditor";
 import { managementPageURL } from "../../diagnostics/managementPages";
 import { getLogViewerParams } from "../../diagnostics/logs/IndexedLogs/LogViewerParams";
+import { getScreenName } from "../machineApplyMainCode";
 
 
 
@@ -329,6 +330,7 @@ export class ServiceDetailPage extends qreact.Component {
                         const outputKey = getPathStr2(key, index + "");
                         const isWatching = this.state.watchingOutputs[outputKey].isWatching;
                         let outputData = this.state.watchingOutputs[outputKey].data;
+                        const screenName = getScreenName({ serviceKey: key, index });
 
                         return <div key={machineId}
                             className={css.pad2(12).vbox(10).bord2(0, 0, 20).fillWidth + backgroundColor}
@@ -337,6 +339,9 @@ export class ServiceDetailPage extends qreact.Component {
                                 className={css.hbox(12)}
                             >
                                 <div className={css.vbox(5)}>
+                                    <div>
+                                        {screenName}
+                                    </div>
                                     <div>
                                         {machineId} ({machineInfo.info["getExternalIP"]})
                                     </div>
@@ -494,12 +499,6 @@ export class ServiceDetailPage extends qreact.Component {
                     {this.state.isKillingRolling ? "Killing..." : `💀 Kill ${rollingServiceCount} Rolling Service${rollingServiceCount === 1 ? "" : "s"}`}
                 </button>}
 
-                {!!configT.parameters.rollingWindow && <div>
-                    <div className={css.colorhsl(0, 50, 50).fontSize(14).fontWeight("bold")}>
-                        IMPORTANT! Service has a rolling window, so updates might not appear immediately.
-                    </div>
-                </div>}
-
                 {hasUnsavedChanges && <>
                     <Button
                         flavor="noui"

package/src/deployManager/machineApplyMainCode.ts

@@ -124,7 +124,7 @@ const getLiveMachineInfo = measureWrap(async function getLiveMachineInfo() {
 });
 
 const SCREEN_SUFFIX = "-dply";
-function getScreenName(config: { serviceKey: string; index: number }): string {
+export function getScreenName(config: { serviceKey: string; index: number }): string {
     return `${config.serviceKey}-${config.index}${SCREEN_SUFFIX}`.replace(/[^a-zA-Z0-9\-_]/g, "_");
 }
 
@@ -398,8 +398,9 @@ const getScreenState = measureWrap(async function getScreenState(populateIsProce
 }[]> {
     const prefix = getTmuxPrefix();
     const delimit = "::::";
-    // tmux list-panes -a -F "#{session_name}::::#{pane_pid}"
-    let screenList = (await runPromise(`${prefix}tmux list-panes -a -F "#{session_name}${delimit}#{pane_pid}"`))
+    // Use list-sessions instead of list-panes -a to avoid zombie sessions
+    // 2>/dev/null suppresses "no server running" errors, -r prevents xargs from running if input is empty
+    let screenList = (await runPromise(`${prefix}tmux list-sessions -F "#{session_name}" 2>/dev/null | xargs -r -I {} tmux list-panes -t {} -F "{}${delimit}#{pane_pid}"`))
         .split("\n")
         .filter(x => x.includes(delimit))
         .map(x => ({

package/src/diagnostics/logs/lifeCycleAnalysis/lifeCycles.tsx

@@ -22,13 +22,13 @@ IMPORTANT! Now I am properly calling shutdown, so none of the streamed logs shou
 
 //todonext
 
-UGH... server notification isn't working now. UGH...
 
-5) Deploy watcher service to remote (yarn error-watch-public)
-6) Deploy CYOA
-
-5) Test on actual server, with actual logs
+2) One of the cyoa instances... does not exist? I think the tmux screen might be in a bad state?
+    - Maybe... our collection has... duplicates, and/or, references something broken? Because... tmux ls looks fine to me...
+        - In the deployed machines list, we should really show the screen name. Don't we know the screen name? Isn't that the only way we know it's deployed to that machine? 
+3) "guessed node id" is never working? At least, on the machine's page it is ALWAYS empty, even though it should be almost always detected...
 
+4) Verify it works again, when we have multiple servers
 
 Invalid addition, you tried to add 1 + Infinity, operands must be valid numbers