deblan/remote-i3wm-ws
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Screenshot server side optimised

Browse source
This commit is contained in:
Simon Vieille 2018-02-14 15:47:45 +01:00
parent 3a3ff9215f
commit 9bc4cbd489
No known key found for this signature in database
GPG key ID: 919533E2B946EA10
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/assets/js/main.js
View file

@ -198,7 +198,7 @@ var liveClickHandler = function(e) {
if (isLive) { if (isLive) {
ws.send('{"type":"screenshot"}'); ws.send('{"type":"screenshot"}');
window.setTimeout(doScreenshot, 300); window.setTimeout(doScreenshot, 100);
} }
} }

19
server/src/resource/server.php
View file

@ -168,19 +168,26 @@ $server->addMessageHandler('text', function (ConnectionInterface $from, array $d
}); });
$server->addMessageHandler('screenshot', function (ConnectionInterface $from, array $data) use ($shell, $messageOutput) { $server->addMessageHandler('screenshot', function (ConnectionInterface $from, array $data) use ($shell, $messageOutput) {
$tmpFilename = sprintf('%s/remote_i3wm_ws_screenshot.jpg', sys_get_temp_dir()); $tmpFilename = sprintf('%s/remote_i3wm_ws_screenshot.lock', sys_get_temp_dir());
$shell->exec('import -window root -quality 10 -display :0 %1$s && chmod 600 %1$s', $tmpFilename);
if (file_exists($tmpFilename)) { if (file_exists($tmpFilename) && time() - filemtime($tmpFilename) < 10) {
$base64 = base64_encode(file_get_contents($tmpFilename)); return;
}
touch($tmpFilename);
$content = $shell->exec('import -window root -quality 10 -display :0 jpeg:-');
if (!empty($content)) {
$base64 = base64_encode($content);
$from->send(json_encode([ $from->send(json_encode([
'type' => 'screenshot', 'type' => 'screenshot',
'value' => $base64, 'value' => $base64,
])); ]));
unlink($tmpFilename);
} }
unlink($tmpFilename);
}); });
$server->addMessageHandler('messages', function (ConnectionInterface $from, array $data) use ($server) { $server->addMessageHandler('messages', function (ConnectionInterface $from, array $data) use ($server) {