0.6.0: noVNC graphical console (websockify + novnc, iframe, auto-stop)
This commit is contained in:
1 parent
53332d9a07
commit
21c259ec4f
5 files changed
+177
-2
No files matched your search
@@ -200,6 +200,7 @@ joblog($log, 'state after action: ' . $stateAfter);
|
|||||||
|
|
||||||
if (in_array($verb, ['stop', 'poweroff', 'destroy'], true)) {
|
if (in_array($verb, ['stop', 'poweroff', 'destroy'], true)) {
|
||||||
vmm_console_stop($name);
|
vmm_console_stop($name);
|
||||||
|
vmm_novnc_stop($name);
|
||||||
}
|
}
|
||||||
|
|
||||||
$job['rc'] = $rc;
|
$job['rc'] = $rc;
|
||||||
|
|||||||
+129
@@ -830,6 +830,135 @@ function vmm_delete_data_file(string $dir, string $name): array
|
|||||||
* Turn a bhyve VNC bind address ("0.0.0.0:5901") into something a human can
|
* Turn a bhyve VNC bind address ("0.0.0.0:5901") into something a human can
|
||||||
* actually connect to. 0.0.0.0 is a listen address, not a destination.
|
* actually connect to. 0.0.0.0 is a listen address, not a destination.
|
||||||
*/
|
*/
|
||||||
|
function vmm_novnc_ready(): array
|
||||||
|
{
|
||||||
|
$bin = '/usr/local/bin/websockify';
|
||||||
|
$web = '/usr/local/libexec/novnc';
|
||||||
|
return [
|
||||||
|
'binary' => $bin,
|
||||||
|
'web' => $web,
|
||||||
|
'ok' => is_executable($bin) && is_file($web . '/vnc.html'),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
function vmm_novnc_state_file(string $vm): string
|
||||||
|
{
|
||||||
|
return VMM_ROOT . '/state/novnc/' . preg_replace('/[^A-Za-z0-9._-]/', '_', $vm) . '.json';
|
||||||
|
}
|
||||||
|
|
||||||
|
function vmm_novnc_status(string $vm): ?array
|
||||||
|
{
|
||||||
|
$f = vmm_novnc_state_file($vm);
|
||||||
|
if (!is_file($f)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
$st = json_decode((string)file_get_contents($f), true);
|
||||||
|
if (!is_array($st) || !vmm_pid_alive((int)($st['pid'] ?? 0))) {
|
||||||
|
@unlink($f);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return $st;
|
||||||
|
}
|
||||||
|
|
||||||
|
function vmm_novnc_stop(string $vm): array
|
||||||
|
{
|
||||||
|
$st = vmm_novnc_status($vm);
|
||||||
|
if ($st === null) {
|
||||||
|
return ['ok' => true, 'stopped' => false];
|
||||||
|
}
|
||||||
|
exec('/bin/kill ' . (int)$st['pid'] . ' >/dev/null 2>&1');
|
||||||
|
usleep(300000);
|
||||||
|
exec('/bin/kill -9 ' . (int)$st['pid'] . ' >/dev/null 2>&1');
|
||||||
|
@unlink(vmm_novnc_state_file($vm));
|
||||||
|
return ['ok' => true, 'stopped' => true];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Serve the VM's VNC screen through noVNC (websockify + static web root).
|
||||||
|
*/
|
||||||
|
function vmm_novnc_start(string $vm, string $bindHost = ''): array
|
||||||
|
{
|
||||||
|
$ready = vmm_novnc_ready();
|
||||||
|
if (!$ready['ok']) {
|
||||||
|
return ['ok' => false, 'error' => 'noVNC/websockify not installed (pkg install novnc py312-websockify)'];
|
||||||
|
}
|
||||||
|
if (vmm_vm_state($vm) !== 'running') {
|
||||||
|
return ['ok' => false, 'error' => 'vm is not running'];
|
||||||
|
}
|
||||||
|
$info = vmm_info($vm);
|
||||||
|
$vncPort = 0;
|
||||||
|
foreach (($info['sections']['console-ports'] ?? []) as $b) {
|
||||||
|
if (!empty($b['data']['vnc']) && preg_match('/:(\d+)$/', (string)$b['data']['vnc'], $m)) {
|
||||||
|
$vncPort = (int)$m[1];
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ($vncPort === 0) {
|
||||||
|
return ['ok' => false, 'error' => 'this vm has no VNC screen (graphics="no"?)'];
|
||||||
|
}
|
||||||
|
if ($bindHost === '') {
|
||||||
|
$bindHost = vmm_vnc_host_for_vm($vm);
|
||||||
|
}
|
||||||
|
$existing = vmm_novnc_status($vm);
|
||||||
|
if ($existing !== null) {
|
||||||
|
return ['ok' => true] + $existing;
|
||||||
|
}
|
||||||
|
|
||||||
|
$port = 0;
|
||||||
|
for ($p = 6080; $p <= 6099; $p++) {
|
||||||
|
$fp = @fsockopen('127.0.0.1', $p, $errno, $errstr, 0.2);
|
||||||
|
if ($fp === false) {
|
||||||
|
$port = $p;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
fclose($fp);
|
||||||
|
}
|
||||||
|
if ($port === 0) {
|
||||||
|
return ['ok' => false, 'error' => 'no free port in 6080-6099'];
|
||||||
|
}
|
||||||
|
|
||||||
|
$dir = VMM_ROOT . '/state/novnc';
|
||||||
|
if (!is_dir($dir)) {
|
||||||
|
@mkdir($dir, 0750, true);
|
||||||
|
}
|
||||||
|
$log = $dir . '/' . $vm . '.log';
|
||||||
|
$cmd = sprintf(
|
||||||
|
'/usr/bin/nohup %s --web %s %s %s > %s 2>&1 &',
|
||||||
|
escapeshellarg($ready['binary']),
|
||||||
|
escapeshellarg($ready['web']),
|
||||||
|
escapeshellarg($bindHost . ':' . $port),
|
||||||
|
escapeshellarg('127.0.0.1:' . $vncPort),
|
||||||
|
escapeshellarg($log)
|
||||||
|
);
|
||||||
|
if (function_exists('exec')) {
|
||||||
|
exec($cmd);
|
||||||
|
} else {
|
||||||
|
@shell_exec($cmd);
|
||||||
|
}
|
||||||
|
usleep(700000);
|
||||||
|
|
||||||
|
$pid = 0;
|
||||||
|
exec('/usr/bin/pgrep -f ' . escapeshellarg('websockify --web ' . $ready['web'] . ' ' . $bindHost . ':' . $port) . ' 2>/dev/null', $out, $rc);
|
||||||
|
if ($rc === 0 && !empty($out[0])) {
|
||||||
|
$pid = (int)$out[0];
|
||||||
|
}
|
||||||
|
if ($pid === 0) {
|
||||||
|
return ['ok' => false, 'error' => 'websockify did not start, see ' . $log];
|
||||||
|
}
|
||||||
|
|
||||||
|
$st = [
|
||||||
|
'vm' => $vm,
|
||||||
|
'pid' => $pid,
|
||||||
|
'port' => $port,
|
||||||
|
'host' => $bindHost,
|
||||||
|
'vnc_port' => $vncPort,
|
||||||
|
'started' => time(),
|
||||||
|
'url' => sprintf('http://%s:%d/vnc.html?autoconnect=1&resize=scale&path=websockify', $bindHost, $port),
|
||||||
|
];
|
||||||
|
file_put_contents(vmm_novnc_state_file($vm), json_encode($st, JSON_PRETTY_PRINT));
|
||||||
|
return ['ok' => true] + $st;
|
||||||
|
}
|
||||||
|
|
||||||
function vmm_console_state_file(string $vm): string
|
function vmm_console_state_file(string $vm): string
|
||||||
{
|
{
|
||||||
return VMM_ROOT . '/state/console/' . preg_replace('/[^A-Za-z0-9._-]/', '_', $vm) . '.json';
|
return VMM_ROOT . '/state/console/' . preg_replace('/[^A-Za-z0-9._-]/', '_', $vm) . '.json';
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"appname": "VM Manager",
|
"appname": "VM Manager",
|
||||||
"version": "0.5.1",
|
"version": "0.6.0",
|
||||||
"rootfolder": "/mnt/Daten/extensions/vmmngr",
|
"rootfolder": "/mnt/Daten/extensions/vmmngr",
|
||||||
"vm_source": "auto",
|
"vm_source": "auto",
|
||||||
"bridges": ["ix0bridge"],
|
"bridges": ["ix0bridge"],
|
||||||
|
|||||||
@@ -24,6 +24,20 @@ if (strtoupper((string)($_SERVER['REQUEST_METHOD'] ?? '')) === 'POST' && isset($
|
|||||||
$vmName = $name;
|
$vmName = $name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($verb === 'novnc_start' || $verb === 'novnc_stop') {
|
||||||
|
if ($verb === 'novnc_stop') {
|
||||||
|
vmm_novnc_stop($name);
|
||||||
|
$_SESSION['vmmngr_error'] = gettext('noVNC stopped.');
|
||||||
|
} else {
|
||||||
|
$res = vmm_novnc_start($name);
|
||||||
|
$_SESSION['vmmngr_error'] = $res['ok']
|
||||||
|
? sprintf(gettext('noVNC on http://%s:%d'), $res['host'], $res['port'])
|
||||||
|
: (string)$res['error'];
|
||||||
|
}
|
||||||
|
header('Location: vmmngr_vm.php?name=' . urlencode($name));
|
||||||
|
exit;
|
||||||
|
}
|
||||||
|
|
||||||
if ($verb === 'console_start') {
|
if ($verb === 'console_start') {
|
||||||
$res = vmm_console_start($name);
|
$res = vmm_console_start($name);
|
||||||
$_SESSION['vmmngr_error'] = $res['ok']
|
$_SESSION['vmmngr_error'] = $res['ok']
|
||||||
@@ -211,6 +225,37 @@ vmm_nav('dashboard');
|
|||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
|
||||||
|
<?php $nv = vmm_novnc_ready(); $nvSt = vmm_novnc_status($name); ?>
|
||||||
|
<table class="area_data_settings" style="width:100%;border-collapse:collapse;">
|
||||||
|
<colgroup><col class="area_data_settings_col_tag"><col class="area_data_settings_col_data"></colgroup>
|
||||||
|
<thead><?php html_separator2(); html_titleline2(gettext('Graphical console (noVNC)'), 2); ?></thead>
|
||||||
|
<tbody>
|
||||||
|
<tr>
|
||||||
|
<td class="celltag"><?=gettext('Status');?></td>
|
||||||
|
<td class="celldata">
|
||||||
|
<?php if (!$nv['ok']): ?>
|
||||||
|
<span class="vmm-miss"><?=gettext('not installed');?></span>
|
||||||
|
<span class="vmm-mono" style="margin-left:8px;">pkg install novnc py312-websockify</span>
|
||||||
|
<?php elseif ($nvSt !== null): ?>
|
||||||
|
<a class="formbtn" href="<?=vmm_h('http://' . $nvSt['host'] . ':' . (int)$nvSt['port'] . '/vnc.html?autoconnect=1&resize=scale&path=websockify');?>" target="_blank"><?=gettext('open in a tab');?></a>
|
||||||
|
<button type="submit" class="formbtn" name="act" value="novnc_stop:<?=vmm_h($name);?>" style="margin-left:8px;"><?=gettext('Stop');?></button>
|
||||||
|
<div style="opacity:.75;margin-top:4px;"><?=gettext('Serves the VNC screen of this VM through websockify. No password - same exposure as the VNC port itself.');?></div>
|
||||||
|
<?php else: ?>
|
||||||
|
<button type="submit" class="formbtn" name="act" value="novnc_start:<?=vmm_h($name);?>"><?=gettext('Start noVNC');?></button>
|
||||||
|
<?php endif; ?>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<?php if ($nvSt !== null): ?>
|
||||||
|
<tr>
|
||||||
|
<td colspan="2" class="celldata">
|
||||||
|
<iframe src="<?=vmm_h('http://' . $nvSt['host'] . ':' . (int)$nvSt['port'] . '/vnc.html?autoconnect=1&resize=scale&path=websockify');?>"
|
||||||
|
style="width:100%;height:520px;border:1px solid rgba(127,127,127,.4);border-radius:4px;background:#000;"></iframe>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<?php endif; ?>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
|
|||||||
+1
-1
@@ -1 +1 @@
|
|||||||
0.5.1
|
0.6.0
|
||||||
Reference in new issue
Block a user