querysub 0.236.0 → 0.238.0

package/package.json

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

@@ -325,12 +325,11 @@ type ServiceConfig = ${serviceConfigType}
                         const outputData = this.state.watchingOutputs[outputKey].data;
 
                         return <div key={machineId}
-                            className={css.pad2(12).button.bord2(0, 0, 20) + backgroundColor}
-                            onClick={() => {
-                                currentViewParam.value = "machine-detail";
-                                selectedMachineIdParam.value = machineId;
-                            }}>
-                            <div className={css.hbox(12)}>
+                            className={css.pad2(12).vbox(10).bord2(0, 0, 20) + backgroundColor}
+                        >
+                            <div
+                                className={css.hbox(12)}
+                            >
                                 <div className={css.flexGrow(1)}>
                                     {machineId} ({machineInfo.info["getExternalIP"]})
                                 </div>
@@ -364,7 +363,19 @@ type ServiceConfig = ${serviceConfigType}
                                 )}
 
                                 <div
-                                    className={css.pad2(8, 4).button}
+                                    className={css.button.pad2(16, 8).bord2(0, 0, 10) + css.hsl(200, 70, 90)}
+                                    onClick={() => {
+                                        currentViewParam.value = "machine-detail";
+                                        selectedMachineIdParam.value = machineId;
+                                    }}
+                                >
+                                    View Machine
+                                </div>
+
+
+                                <div
+                                    className={css.button.pad2(16, 8).bord2(0, 0, 10) + (isWatching ? css.hsl(0, 70, 90) : css.hsl(120, 70, 90))
+                                    }
                                     onClick={(e) => {
                                         e.stopPropagation();
                                         let applyNodeId = machineInfo.applyNodeId;
@@ -377,9 +388,7 @@ type ServiceConfig = ${serviceConfigType}
                                         });
                                     }}
                                 >
-                                    <div className={css.pad2(4, 8).bord2(0, 0, 10) + (isWatching ? css.hsl(0, 70, 90) : css.hsl(120, 70, 90))}>
-                                        {isWatching ? "Stop Watching Output" : "Watch Screen Output"}
-                                    </div>
+                                    {isWatching ? "Stop Watching Output" : "Watch Screen Output"}
                                 </div>
                             </div>
                             {hasError && (
@@ -409,19 +418,25 @@ type ServiceConfig = ${serviceConfigType}
                                 </div>
                             )}
 
-                            {isWatching && (
+                            {isWatching &&
                                 <div
                                     className={
                                         css.pad2(8).bord2(0, 0, 10).hsl(0, 0, 10).colorhsl(0, 0, 100)
                                             .whiteSpace("pre-wrap").fontFamily("monospace")
                                             .overflowAuto
                                             .maxHeight("60vh")
+                                            .fillWidth
                                     }
+                                    // Gives the user the cursor, which makes navigating nice
+                                    contentEditable
+                                    onClick={e => e.stopPropagation()}
+
                                 >
                                     {outputData && outputData || "Waiting for output..."}
+                                    {/* <div className={css.size(1, `65vh`)} /> */}
                                     <ScrollOnMount debugText={`Screen ${outputKey}`} />
                                 </div>
-                            )}
+                            }
                         </div>;
                     })}
                 </div>

package/src/deployManager/machineApplyMainCode.ts

@@ -82,6 +82,7 @@ export async function streamScreenOutput(config: {
 
     async function stop() {
         if (stopped) return;
+        console.log(`Stopping stream output for ${screenName}`);
         stopped = true;
 
         if (childProcess) {
@@ -107,6 +108,7 @@ export async function streamScreenOutput(config: {
 
             childProcess.stdout?.on("data", (data) => {
                 if (stopped) return;
+                console.log(`Captured data for ${screenName}: ${data.length}`);
                 started.resolve();
                 void onDataWrapped(data.toString());
             });

package/src/deployManager/machineController.ts

@@ -133,6 +133,7 @@ class MachineControllerClientBase {
     }): Promise<void> {
         let forwardToNodeId = forwardedCallbacks.get(config.callbackId);
         if (forwardToNodeId) {
+            console.log(`onScreenOutput forward ${config.callbackId} ${config.data.length}`);
             await MachineControllerClient.nodes[forwardToNodeId].onScreenOutput({
                 key: config.key,
                 index: config.index,
@@ -141,6 +142,7 @@ class MachineControllerClientBase {
             });
             return;
         }
+        console.log(`onScreenOutput ${config.callbackId} ${config.data.length}`);
 
         let callback = callbacks.get(config.callbackId);
         if (!callback) {

package/src/deployManager/spec.txt

@@ -1,7 +1,12 @@
+todonext;
+Syncing isn't updating?
+
 3) Hmm... being able to watch the output for a service would be useful, and... it should be... trivial to do?
     - Buttons per key + index, which we can figure out clientside. Stream results under the button, and we can stream multiple at once?
     - OH, just for superusers, so the browser can connect directly!
 
+OH! I think if something is scrollable, and is scrolled down, it'll stick to the bottom. We just need it to start scrollable!
+
 4) Destroy our testing digital ocean server
 
 5) Setup on our regular digital ocean server