'xterm fixes for uxcandy'

boomyjee · boomyjee · commit 73cd0423f56f · 2020-04-09T02:17:06.000+02:00
diff --git a/plugins/xterm/api.php b/plugins/xterm/api.php
@@ -3,20 +3,25 @@
 require_once __DIR__."/../../server/api.php";
 
 FileApi::extend('xterm_open',function($self) {
+
     $path = $self->_pathFromUrl(@$_REQUEST['path']);
     if (!$path) { echo "ERROR: Invalid path"; die(); }
 
     $reflection = new \ReflectionClass(get_class($self));
     $apiFile = $reflection->getFileName();
-    exec("/usr/bin/php ".__DIR__."/server.php ".escapeshellarg($apiFile));
-    $port = file_get_contents(__DIR__."/cache/".get_current_user().".port");
+    $serverStartOutput = shell_exec("/usr/bin/php ".__DIR__."/server.php ".escapeshellarg($apiFile));
+    
+    $current_user = posix_getpwuid(posix_getuid())['name'];
+    $port = file_get_contents(__DIR__."/cache/".$current_user.".port");
+
+    $plugin_root = !empty($_REQUEST['dayside_url']) ? $_REQUEST['dayside_url']."/plugins/xterm/" : "";
     
     ?>
         <!doctype html>
         <html>
         <head>
-            <link rel="stylesheet" href="assets/xterm.css" />
-            <script src="assets/xterm.js"></script>
+            <link rel="stylesheet" href="<?=$plugin_root?>assets/xterm.css" />
+            <script src="<?=$plugin_root?>assets/xterm.js"></script>
             <style>
                 * { margin: 0; padding: 0; box-sizing: border-box; }
                 html, body, #terminal { width: 100%; height: 100%; background: #000; }
@@ -26,6 +31,8 @@
         <body>
             <div id="terminal" />
             <script>
+                console.debug(<?=json_encode($serverStartOutput)?>);
+
                 var terminal = new Terminal({cols:130,rows:50});
                 var terminalEl = document.getElementById('terminal');
                 terminal.open(terminalEl);
diff --git a/plugins/xterm/server.php b/plugins/xterm/server.php
@@ -133,6 +133,7 @@ static function createWorker() {
                 $connection->process = null;
 
                 if (count($worker->connections)==1) {
+                    echo "dying since last...\n";
                     \posix_kill(\file_get_contents(static::$pidFile), \SIGINT);
                 }
             }
@@ -147,8 +148,9 @@ static function createWorker() {
     }
 }
 
-Worker::$pidFile = __DIR__."/cache/".get_current_user().".pid";
-Worker::$portFile = __DIR__."/cache/".get_current_user().".port";
-Worker::$logFile = __DIR__."/cache/".get_current_user().".log";
+$current_user = posix_getpwuid(posix_getuid())['name'];
+Worker::$pidFile = __DIR__."/cache/".$current_user.".pid";
+Worker::$portFile = __DIR__."/cache/".$current_user.".port";
+Worker::$logFile = __DIR__."/cache/".$current_user.".log";
 Worker::createWorker();
 Worker::runAll();
diff --git a/plugins/xterm/xterm.js b/plugins/xterm/xterm.js
@@ -25,7 +25,7 @@ dayside.plugins.xterm = () => dayside.ready(()=>{
         consoleTab.tabPanel.selectTab(consoleTab);
 
         frame[0].path = path;
-        FileApi.request('xterm_open', {_type:"xterm_open",path:path}, false, function(answer) {
+        FileApi.request('xterm_open', {_type:"xterm_open",path:path,dayside_url:dayside.url}, false, function(answer) {
             frame[0].contentDocument.open();
             frame[0].contentDocument.write(answer.data);
             frame[0].contentDocument.close();

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,7 @@ static function createWorker() {`
`133`	`133`	`$connection->process = null;`
`134`	`134`
`135`	`135`	`if (count($worker->connections)==1) {`
	`136`	`+ echo "dying since last...\n";`
`136`	`137`	`\posix_kill(\file_get_contents(static::$pidFile), \SIGINT);`
`137`	`138`	`}`
`138`	`139`	`}`
`@@ -147,8 +148,9 @@ static function createWorker() {`
`147`	`148`	`}`
`148`	`149`	`}`
`149`	`150`
`150`		`-Worker::$pidFile = __DIR__."/cache/".get_current_user().".pid";`
`151`		`-Worker::$portFile = __DIR__."/cache/".get_current_user().".port";`
`152`		`-Worker::$logFile = __DIR__."/cache/".get_current_user().".log";`
	`151`	`+$current_user = posix_getpwuid(posix_getuid())['name'];`
	`152`	`+Worker::$pidFile = __DIR__."/cache/".$current_user.".pid";`
	`153`	`+Worker::$portFile = __DIR__."/cache/".$current_user.".port";`
	`154`	`+Worker::$logFile = __DIR__."/cache/".$current_user.".log";`
`153`	`155`	`Worker::createWorker();`
`154`	`156`	`Worker::runAll();`