Add ability to show terminal style output

Author: dcflachs

source/compose.manager/php/compose_manager_main.php

@@ -231,25 +231,34 @@ function saveEdit() {
 }
 
 function ComposeUp(path) {
+  var height = 800;
+  var width = 1200;
+  
   $.post(compURL,{action:'composeUp',path:path},function(data) {
     if (data) {
-      openBox(data,"Stack "+basename(path)+" Up",800,1200);
+      openBox(data,"Stack "+basename(path)+" Up",height,width);
     }
   })
 }
 
 function ComposeDown(path) {
+  var height = 800;
+  var width = 1200;
+
   $.post(compURL,{action:'composeDown',path:path},function(data) {
     if (data) {
-      openBox(data,"Stack "+basename(path)+" Down",800,1200);
+      openBox(data,"Stack "+basename(path)+" Down",height,width);
     }
   })
 }
 
 function ComposePull(path) {
+  var height = 800;
+  var width = 1200;
+
   $.post(compURL,{action:'composePull',path:path},function(data) {
     if (data) {
-      openBox(data,"Stack "+basename(path)+" Pull",800,1200);
+      openBox(data,"Stack "+basename(path)+" Pull",height,width);
     }
   })
 }

source/compose.manager/php/compose_util.php

@@ -2,13 +2,51 @@
 
 require_once("/usr/local/emhttp/plugins/compose.manager/php/defines.php");
 
+function logger($string) {
+	$string = escapeshellarg($string);
+	exec("logger ".$string);
+}
+
 function sanitizeStr($a) {
 	$a = str_replace(".","_",$a);
 	$a = str_replace(" ","_",$a);
 	return str_replace("-","_",$a);
 }
 
+function execComposeCommandInTTY($cmd)
+{
+	global $socket_name;;
+	$pid = exec("pgrep -a ttyd|awk '/\\/$socket_name\\.sock/{print \$1}'");
+	logger($pid);
+	if ($pid) exec("kill $pid");
+	@unlink("/var/tmp/$socket_name.sock");
+	$command = "ttyd -R -o -i '/var/tmp/$socket_name.sock' $cmd". " > /dev/null &"; 
+	exec($command);
+	logger($command);
+}
+
 function echoComposeCommand($action)
+// {
+// 	global $plugin_root;
+// 	$path = isset($_POST['path']) ? urldecode(($_POST['path'])) : "";
+// 	$unRaidVars = parse_ini_file("/var/local/emhttp/var.ini");
+// 	if ($unRaidVars['mdState'] != "STARTED" ) {
+// 		echo $plugin_root."/scripts/arrayNotStarted.sh";
+// 		logger("Array not Started!");
+// 	}
+// 	else
+// 	{
+// 		$projectName = basename($path);
+// 		if ( is_file("$path/name") ) {
+// 			$projectName = trim(file_get_contents("$path/name"));
+// 		}
+// 		$projectName = sanitizeStr($projectName);
+// 		$path .= "/compose.yml";
+// 		// exec("chmod +x ".escapeshellarg($plugin_root."/scripts/compose.sh"));
+// 		$composeCommand = $plugin_root."/scripts/compose.sh"."&arg1=".$action."&arg2=".$path."&arg3=".$projectName;
+// 		echo $composeCommand;
+// 	}
+// }
 {
 	global $plugin_root;
 	$path = isset($_POST['path']) ? urldecode(($_POST['path'])) : "";
@@ -25,10 +63,13 @@ function echoComposeCommand($action)
 		}
 		$projectName = sanitizeStr($projectName);
 		$path .= "/compose.yml";
-		// exec("chmod +x ".escapeshellarg($plugin_root."/scripts/compose.sh"));
-		$composeCommand = $plugin_root."/scripts/compose.sh"."&arg1=".$action."&arg2=".$path."&arg3=".$projectName;
-		echo $composeCommand;
-	}
+		$compose_command = join(" ", array(escapeshellarg($plugin_root."scripts/compose.sh"),escapeshellarg($action),escapeshellarg($path),escapeshellarg($projectName)));
+		logger($compose_command);
+		
+		execComposeCommandInTTY($compose_command);
+		echo "/plugins/compose.manager/php/show_ttyd.php";
+		logger("/plugins/compose.manager/php/show_ttyd.php");
+	}	
 }
 
 switch ($_POST['action']) {

source/compose.manager/php/defines.php

@@ -1,4 +1,5 @@
 <?php
 $compose_root = "/boot/config/plugins/compose.manager/projects";
 $plugin_root = "/usr/local/emhttp/plugins/compose.manager/";
+$socket_name = "compose_manager_action";
 ?>

source/compose.manager/php/show_ttyd.php

@@ -0,0 +1,11 @@
+<?php
+require_once("/usr/local/emhttp/plugins/compose.manager/php/defines.php");
+// $docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
+// require_once "$docroot/webGui/include/Secure.php";
+
+// $done = unscript($_GET['done']??'');
+
+$url = "/dockerterminal/$socket_name/";
+echo '<iframe src="'.$url.'" style="border: none; width: 100%; height: 100%;"></iframe>';
+// echo "<p class='centered'><button class='logLine' type='button' onclick=top.Shadowbox.close()'>"+decodeURI($done)+"</button></p>";
+?>