diff --git a/config.yaml b/config.yaml
index bf49fdb..06eb52f 100644
--- a/config.yaml
+++ b/config.yaml
@@ -102,7 +102,5 @@ remote:
label: Volume
- label: Desktop
items:
- - type: screenshot
- label: Screenshot
- - type: live_video
- label: Live video
+ - type: capture
+ label: Capture
diff --git a/live_controller.go b/live_controller.go
new file mode 100644
index 0000000..c7926f8
--- /dev/null
+++ b/live_controller.go
@@ -0,0 +1,67 @@
+package main
+
+import (
+ "bytes"
+ "image/color"
+ "image/jpeg"
+ "math"
+ "net/http"
+ "time"
+
+ "github.com/kbinani/screenshot"
+ "github.com/labstack/echo/v4"
+)
+
+func captureController(c echo.Context) error {
+ bounds := screenshot.GetDisplayBounds(0)
+
+ switch c.QueryParam("type") {
+ case "screenshot":
+ if img, err := screenshot.CaptureRect(bounds); err == nil {
+ var buf bytes.Buffer
+ jpeg.Encode(&buf, img, nil)
+
+ c.Response().Header().Set("Content-Type", "image/jpeg")
+
+ return c.Blob(http.StatusOK, "image/jpeg", buf.Bytes())
+ }
+ default:
+ c.Response().Header().Set("Content-Type", "multipart/x-mixed-replace; boundary=frame")
+
+ for {
+ if img, err := screenshot.CaptureRect(bounds); err == nil {
+ var buf bytes.Buffer
+
+ if c.QueryParam("pointer") == "1" {
+ currentX, currentY := GetPointerPosition()
+ pointerSize := 2 * 16.0
+
+ pixelColor := color.RGBA{
+ R: 255,
+ G: 0,
+ B: 0,
+ A: 255,
+ }
+
+ for x := math.Max(0.0, currentX-pointerSize/2); x <= currentX+3; x++ {
+ for y := math.Max(0.0, currentY-pointerSize/2); y < currentY+3; y++ {
+ img.SetRGBA(int(x), int(y), pixelColor)
+ }
+ }
+ }
+
+ jpeg.Encode(&buf, img, nil)
+
+ _, _ = c.Response().Write([]byte("--frame\r\n"))
+
+ c.Response().Write([]byte("Content-Type: image/jpeg\r\n\r\n"))
+ c.Response().Write(buf.Bytes())
+ c.Response().Write([]byte("\r\n"))
+
+ time.Sleep(33 * time.Millisecond)
+ }
+ }
+ }
+
+ return nil
+}
diff --git a/main.go b/main.go
index 8c56943..c9bf537 100644
--- a/main.go
+++ b/main.go
@@ -63,6 +63,7 @@ func main() {
e.GET("/manifest.webmanifest", manifestController)
e.GET("/", homeController)
e.GET("/ws", wsController)
+ e.GET("/capture", captureController)
if config.Server.Tls.Enable == false {
e.Logger.Fatal(e.Start(config.Server.Listen))
diff --git a/remote-i3wm-go b/remote-i3wm-go
new file mode 100755
index 0000000..3132b83
Binary files /dev/null and b/remote-i3wm-go differ
diff --git a/rice-box.go b/rice-box.go
index c8f092d..fdb9f67 100644
--- a/rice-box.go
+++ b/rice-box.go
@@ -18,9 +18,9 @@ func init() {
}
file4 := &embedded.EmbeddedFile{
Filename: "css/main.css",
- FileModTime: time.Unix(1745768085, 0),
+ FileModTime: time.Unix(1765481633, 0),
- Content: string(":root {\n --link-color: #1e3650;\n --bs-link-color: var(--link-color);\n}\n\n* {\n overscroll-behavior: contain !important;\n}\n\na {\n color: var(--link-color);\n}\n\n.btn-primary {\n background: #1e3650;\n border-color: #0e2640;\n}\n\n.nav-pills .nav-link.active {\n background: #1e3650;\n}\n\n.nav-pills .nav-link {\n padding-left: 3px;\n padding-right: 3px;\n}\n\n.nav-link {\n font-size: 10px;\n}\n\n.legend {\n color: #777;\n margin: 3px 0;\n padding: 3px 0;\n border-bottom: 1px solid #eee;\n font-size: 11px;\n text-transform: uppercase;\n}\n\n.btn-sm {\n font-size: 9px;\n}\n\n.select2 {\n min-width: 100%;\n}\n\n.line {\n height: 3px;\n}\n\n.pane {\n display: none;\n}\n\n.no-margin {\n margin: 0;\n}\n\n.no-padding {\n padding: 0;\n}\n\n.no-radius {\n border-radius: 0 !important;\n}\n\n#pointer {\n height: calc(100vh - 33px);\n bottom: 33px;\n margin: auto;\n background: #ccc;\n background-size: contain;\n background-repeat: no-repeat;\n position: absolute;\n width: calc(100% - 50px);\n -webkit-touch-callout: none;\n -webkit-user-select: none;\n -khtml-user-select: none;\n -moz-user-select: none;\n -ms-user-select: none;\n user-select: none;\n}\n\n#scrollbar {\n height: calc(100vh - 33px);\n width: 50px;\n background: #333;\n position: fixed;\n bottom: 33px;\n z-index: 100;\n right: 0;\n}\n\n#mouse {\n position: fixed;\n bottom: 83px;\n z-index: 200;\n width: calc(100vw - 50px);\n padding: 10px;\n background: #fff;\n}\n\n#pane-pointer .form-group {\n padding: 0;\n margin: 0;\n}\n\n#pointer-buttons {\n margin-top: -42px;\n width: 100%;\n z-index: 110;\n position: fixed;\n bottom: 31px;\n padding-left: 0;\n padding-right: 0;\n}\n\n#pointer-buttons .btn {\n height: 50px;\n}\n\n#disconneced {\n position: absolute;\n top: 0;\n width: 100%;\n background: #ff6161;\n color: #fff;\n padding: 5px;\n}\n\n#disconneced a {\n color: #fff;\n font-weight: bold;\n}\n\n#nav {\n border-top: 2px solid #1e3650;\n position: fixed;\n bottom: 0;\n width: 100%;\n height: 33px;\n}\n\n#shortcuts_special_keys input {\n display: none;\n}\n\n#response {\n position: absolute;\n top: 0;\n width: 100%;\n color: #fff;\n background: #748c26;\n padding: 5px;\n display: none;\n}\n\n#screenshot img {\n max-width: 100%;\n margin-top: 10px;\n cursor: pointer;\n}\n\n#mouse-screenshot-live {\n display: inline-block;\n width: 80px;\n padding-left: 5px;\n}\n\n#mouse-text-live {\n display: inline-block;\n width: calc(100% - 100px);\n}\n"),
+ Content: string(":root {\n --link-color: #1e3650;\n --bs-link-color: var(--link-color);\n}\n\n* {\n overscroll-behavior: contain !important;\n}\n\na {\n color: var(--link-color);\n}\n\n.btn-primary {\n background: #1e3650;\n border-color: #0e2640;\n}\n\n.nav-pills .nav-link.active {\n background: #1e3650;\n}\n\n.nav-pills .nav-link {\n padding-left: 3px;\n padding-right: 3px;\n}\n\n.nav-link {\n font-size: 10px;\n}\n\n.legend {\n color: #777;\n margin: 3px 0;\n padding: 3px 0;\n border-bottom: 1px solid #eee;\n font-size: 11px;\n text-transform: uppercase;\n}\n\n.btn-sm {\n font-size: 9px;\n}\n\n.select2 {\n min-width: 100%;\n}\n\n.line {\n height: 3px;\n}\n\n.pane {\n display: none;\n}\n\n.no-margin {\n margin: 0;\n}\n\n.no-padding {\n padding: 0;\n}\n\n.no-radius {\n border-radius: 0 !important;\n}\n\n#pointer {\n height: calc(100vh - 33px);\n bottom: 33px;\n margin: auto;\n background: #ccc;\n background-size: contain;\n background-repeat: no-repeat;\n position: absolute;\n width: calc(100% - 50px);\n -webkit-touch-callout: none;\n -webkit-user-select: none;\n -khtml-user-select: none;\n -moz-user-select: none;\n -ms-user-select: none;\n user-select: none;\n}\n\n#scrollbar {\n height: calc(100vh - 33px);\n width: 50px;\n background: #333;\n position: fixed;\n bottom: 33px;\n z-index: 100;\n right: 0;\n}\n\n#mouse {\n position: fixed;\n bottom: 83px;\n z-index: 200;\n width: calc(100vw - 50px);\n padding: 10px;\n background: #fff;\n}\n\n#pane-pointer .form-group {\n padding: 0;\n margin: 0;\n}\n\n#pointer-buttons {\n margin-top: -42px;\n width: 100%;\n z-index: 110;\n position: fixed;\n bottom: 31px;\n padding-left: 0;\n padding-right: 0;\n}\n\n#pointer-buttons .btn {\n height: 50px;\n}\n\n#disconneced {\n position: absolute;\n top: 0;\n width: 100%;\n background: #ff6161;\n color: #fff;\n padding: 5px;\n}\n\n#disconneced a {\n color: #fff;\n font-weight: bold;\n}\n\n#nav {\n border-top: 2px solid #1e3650;\n position: fixed;\n bottom: 0;\n width: 100%;\n height: 33px;\n}\n\n#shortcuts_special_keys input {\n display: none;\n}\n\n#response {\n position: absolute;\n top: 0;\n width: 100%;\n color: #fff;\n background: #748c26;\n padding: 5px;\n display: none;\n}\n\n.capture-img img {\n max-width: 100%;\n margin-top: 10px;\n cursor: pointer;\n}\n\n#mouse-screenshot-live {\n display: inline-block;\n width: 80px;\n padding-left: 5px;\n}\n\n#mouse-text-live {\n display: inline-block;\n width: calc(100% - 100px);\n}\n"),
}
file6 := &embedded.EmbeddedFile{
Filename: "img/icon.png",
@@ -30,9 +30,9 @@ func init() {
}
file8 := &embedded.EmbeddedFile{
Filename: "js/main.js",
- FileModTime: time.Unix(1745768085, 0),
+ FileModTime: time.Unix(1765482321, 0),
- Content: string("let ws\nlet pointer, scroller, response, screenshotImg\nlet scrollLastTimestamp, scrollLastValue\nlet mousePosX, mousePosY, mouseInitPosX, mouseInitPosY\nlet isLive = false\nlet wsLock = false\nlet isPointerLive = false\nlet isScreenshotWaiting = null\nlet isPointerScreenshotWaiting = false\n\nfunction createWebSocketConnection() {\n const protocol = location.protocol === 'https:' ? 'wss' : 'ws'\n\n ws = new WebSocket(`${protocol}://${window.location.hostname}:${window.location.port}/ws`)\n\n ws.addEventListener('open', function(event) {\n document.querySelector('#disconneced').style.display = 'none'\n unLock()\n })\n\n ws.addEventListener('close', function(event) {\n unLock()\n document.querySelector('#disconneced').style.display = 'block'\n\n window.setTimeout(createWebSocketConnection, 5000)\n })\n \n ws.addEventListener('message', function(event) {\n unLock()\n let data = JSON.parse(event.data)\n\n if (data.type === 'response') {\n response.innerText = data.value\n response.style.display = 'block'\n\n window.setTimeout(function() {\n response.style.display = 'none'\n }, 2500)\n\n return\n }\n\n if (data.type === 'volume') {\n if (data.value.length) {\n setVolume(parseInt(data.value))\n }\n\n return\n }\n\n if (data.type === 'screenshot') {\n if (isScreenshotWaiting || isScreenshotWaiting === null) {\n if (isScreenshotWaiting) {\n isScreenshotWaiting = false\n }\n\n screenshotImg.setAttribute('src', 'data:image/png;base64, ' + data.value)\n }\n\n let pointer = document.querySelector('#pointer')\n\n if (isPointerScreenshotWaiting) {\n pointer.style.backgroundImage = `url('data:image/png;base64, ${data.value}')`\n isPointerScreenshotWaiting = false\n } else {\n pointer.style.backgroundImage = 'none'\n }\n }\n\n return\n })\n}\n\nfunction isLocked() {\n return wsLock === true\n}\n\nfunction lock() {\n wsLock = true\n}\n\nfunction unLock() {\n wsLock = false\n}\n\nfunction send(message) {\n if (isLocked()) {\n return\n }\n\n lock()\n\n ws.send(message)\n}\n\nfunction navigationClickHandler(e) {\n if (e.target.getAttribute('href') === '#') {\n return\n }\n\n Array.from(document.querySelectorAll('.pane')).forEach((item) => {\n item.style.display = 'none'\n })\n\n document.querySelector(e.target.getAttribute('href')).style.display = 'block'\n\n Array.from(document.querySelectorAll('#nav a')).forEach((item) => {\n item.classList.remove('active')\n })\n\n e.target.classList.add('active')\n}\n\nfunction buttonClickHandler(e) {\n send(e.target.getAttribute('data-msg'))\n}\n\nfunction shortcutClearClickHandler(e) {\n document.querySelector('#shortcut-key').value = ''\n\n Array.from(document.querySelectorAll('#shortcuts_special_keys input:checked')).forEach((item) => {\n item.checked = false\n item.change()\n })\n}\n\nfunction shortcutSendClickHandler(e) {\n let keys = []\n let key = document.querySelector('#shortcut-key').value\n\n Array.from(document.querySelectorAll('#shortcuts_special_keys input:checked')).forEach((item) => {\n keys.push(item.value)\n })\n\n if (keys.length) {\n if (key) {\n keys.push(key)\n }\n\n send('{\"type\":\"keys\",\"value\": \"' + (keys.join(',').replace('\"', '\\\\\"')) + '\"}')\n }\n}\n\nfunction textClearClickHandler(e) {\n document.querySelector('#text').value = ''\n}\n\nfunction textSendClickHandler(e) {\n const keys = document.querySelector('#text').value\n\n if (keys.length) {\n send('{\"type\":\"text\",\"value\": \"' + (keys.replace('\"', '\\\\\"')) + '\"}')\n }\n}\n\nfunction textKeyUpHandler(e) {\n const keys = document.querySelector('#text').value\n\n if (e.keyCode === 13) {\n send('{\"type\":\"text\",\"value\": \"' + (keys.replace('\"', '\\\\\"')) + '\"}')\n }\n}\n\nfunction liveTextKeyUpHandler(e) {\n const value = e.target.value\n\n if (e.keyCode === 8) {\n send('{\"type\":\"key\",\"value\": \"backspace\"}')\n } else if (e.keyCode === 13) {\n send('{\"type\":\"key\",\"value\": \"enter\"}')\n } else if (value.length) {\n if (value === ' ') {\n send('{\"type\":\"key\",\"value\": \"space\"}')\n } else {\n send('{\"type\":\"text\",\"value\": \"' + (value.replace('\"', '\\\\\"')) + '\"}')\n }\n\n e.target.value = ''\n }\n}\n\nfunction shortcutsSpecialKeysOnChangeHandler(e) {\n Array.from(document.querySelectorAll('#shortcuts_special_keys input:checked')).forEach((item) => {\n item.parentNode.classList.add('btn-primary')\n item.parentNode.classList.remove('btn-secondary')\n })\n\n Array.from(document.querySelectorAll('#shortcuts_special_keys input:not(:checked)')).forEach((item) => {\n item.parentNode.classList.add('btn-secondary')\n item.parentNode.classList.remove('btn-primary')\n })\n}\n\nfunction pointerClickHandler(e) {\n send('{\"type\":\"pointer\",\"click\":\"left\"}')\n}\n\nfunction scrollerTouchStartHandler(e) {\n mouseInitPosY = e.targetTouches[0].pageY\n}\n\nfunction scrollerTouchMoveHandler(e) {\n let touch = e.changedTouches[0]\n let value = ((touch.pageY - mouseInitPosY > 0) ? 'down' : 'up')\n let now = new Date().getTime()\n\n if (touch.pageY === mouseInitPosY || value === scrollLastValue && scrollLastTimestamp !== null && now - scrollLastTimestamp < 200) {\n return\n }\n\n scrollLastTimestamp = now\n scrollLastValue = value\n mouseInitPosY = touch.pageY\n\n send('{\"type\":\"scroll\",\"value\": \"' + value + '\"}')\n}\n\nfunction pointerTouchStartHandler(e) {\n const touch = e.targetTouches[0]\n mouseInitPosX = touch.pageX\n mouseInitPosY = touch.pageY\n}\n\nfunction pointerLiveHandler(e) {\n if (!e.target.checked) {\n isPointerLive = false\n isPointerScreenshotWaiting = null\n\n return\n }\n\n isPointerLive = true\n\n let doScreenshot = function() {\n if (isPointerLive) {\n if (!isPointerScreenshotWaiting) {\n isPointerScreenshotWaiting = true\n ws.send(`{\"type\":\"screenshot\",\"quality\":\"lq\",\"pointer\":true}`)\n }\n\n window.setTimeout(doScreenshot, 300)\n }\n }\n\n doScreenshot()\n}\n\nfunction pointerTouchMoveHandler(e) {\n if (e.changedTouches.length === 2) {\n return scrollerTouchMoveHandler(e)\n }\n\n const touch = e.changedTouches[0]\n mousePosX = touch.pageX\n mousePosY = touch.pageY\n\n const newX = mousePosX - mouseInitPosX\n const newY = mousePosY - mouseInitPosY\n\n mouseInitPosX = mousePosX\n mouseInitPosY = mousePosY\n\n let msg = '{\"type\":\"pointer\",\"x\": \"' + newX + '\",\"y\": \"' + newY + '\"}'\n\n ws.send(msg)\n}\n\nfunction liveHqClickHandler(e) {\n return liveClickHandler(e, 'hq')\n}\n\nfunction liveLqClickHandler(e) {\n return liveClickHandler(e, 'lq')\n}\n\nfunction liveClickHandler(e, quality) {\n if (isLive) {\n isLive = false\n isScreenshotWaiting = null\n\n document.querySelector('#live-hq').innerText = 'Live HQ'\n document.querySelector('#live-lq').innerText = 'Live LQ'\n\n return\n }\n\n isLive = true\n\n e.target.innerText = 'Stop live'\n\n let doScreenshot = function() {\n if (isLive) {\n if (!isScreenshotWaiting) {\n isScreenshotWaiting = true\n ws.send(`{\"type\":\"screenshot\",\"quality\":\"${quality}\"}`)\n }\n\n window.setTimeout(doScreenshot, 100)\n }\n }\n\n doScreenshot()\n}\n\nfunction fullscreenHandler(e) {\n let element = document.querySelector(e.target.getAttribute('data-target'))\n let isFullscreen = parseInt(e.target.getAttribute('data-fullscreen'))\n\n document.querySelector('body').classList.toggle('fullscreen', isFullscreen)\n\n if (isFullscreen) {\n e.target.setAttribute('data-fullscreen', '0')\n\n if (document.exitFullscreen) {\n document.exitFullscreen()\n } else if (document.webkitExitFullscreen) {\n document.webkitExitFullscreen()\n } else if (document.mozCancelFullScreen) {\n document.mozCancelFullScreen()\n }\n } else {\n e.target.setAttribute('data-fullscreen', '1')\n\n if (element.requestFullscreen) {\n element.requestFullscreen()\n } else if (element.webkitRequestFullscreen) {\n element.webkitRequestFullscreen()\n } else if (element.mozRequestFullScreen) {\n element.mozRequestFullScreen()\n }\n }\n}\n\nfunction documentHashHandler() {\n const hash = window.location.hash\n\n if (hash) {\n document.querySelector('a[href=\"' + hash + '\"]').click()\n } else {\n document.querySelector('#nav > li:first-child a').click()\n }\n}\n\nfunction addEventListenerOn(selector, eventName, listener) {\n if (typeof selector === 'string') {\n Array.from(document.querySelectorAll(selector)).forEach((element) => {\n element.addEventListener(eventName, listener)\n })\n } else {\n selector.addEventListener(eventName, listener)\n }\n}\n\nfunction addListeners() {\n addEventListenerOn('#nav a', 'click', navigationClickHandler)\n addEventListenerOn('button[data-msg]', 'click', buttonClickHandler)\n\n addEventListenerOn('#shortcut-clear', 'click', shortcutClearClickHandler)\n addEventListenerOn('#shortcuts_special_keys input', 'change', shortcutsSpecialKeysOnChangeHandler)\n addEventListenerOn('#shortcut-send', 'click', shortcutSendClickHandler)\n\n addEventListenerOn('#text-clear', 'click', textClearClickHandler)\n addEventListenerOn('#text-send', 'click', textSendClickHandler)\n addEventListenerOn('#text', 'keyup', textKeyUpHandler)\n addEventListenerOn('.live-text', 'keyup', liveTextKeyUpHandler)\n\n addEventListenerOn(scroller, 'touchstart', scrollerTouchStartHandler)\n addEventListenerOn(scroller, 'touchmove', scrollerTouchMoveHandler)\n\n addEventListenerOn(pointer, 'click', pointerClickHandler)\n addEventListenerOn(pointer, 'touchstart', pointerTouchStartHandler)\n addEventListenerOn(pointer, 'touchmove', pointerTouchMoveHandler)\n addEventListenerOn('#mouse-screenshot-live input', 'change', pointerLiveHandler)\n\n addEventListenerOn('#live-hq', 'click', liveHqClickHandler)\n addEventListenerOn('#live-lq', 'click', liveLqClickHandler)\n addEventListenerOn('.btn-fullscreen', 'click', fullscreenHandler)\n}\n\nfunction getVolume() {\n if (document.querySelectorAll('.volume').length) {\n try {\n send('{\"type\":\"volume\",\"value\":\"value\"}')\n } catch (e) {\n }\n\n document.querySelectorAll('.volume input[type=\"range\"]').forEach(function(input) {\n if (input.getAttribute('data-event')) {\n return\n }\n\n input.setAttribute('data-event', 'ok')\n input.addEventListener('change', (e) => {\n send(`{\"type\":\"volume\",\"value\":\"${e.target.value}\"}`)\n })\n })\n }\n\n window.setTimeout(getVolume, 2000)\n}\n\nfunction setVolume(value) {\n document.querySelectorAll('.volume').forEach(function(item) {\n item.querySelector('input[type=\"range\"]').value = value\n })\n}\n\nfunction bootstrap() {\n pointer = document.querySelector('#pointer')\n scroller = document.querySelector('#scrollbar')\n response = document.querySelector('#response')\n screenshotImg = document.querySelector('#screenshot img')\n\n shortcutsSpecialKeysOnChangeHandler()\n createWebSocketConnection()\n addListeners()\n documentHashHandler()\n getVolume()\n\n if ('serviceWorker' in navigator) {\n navigator.serviceWorker.register('/static/js/service_worker.js')\n }\n}\n\naddEventListenerOn(window, 'DOMContentLoaded', bootstrap)\n"),
+ Content: string("let ws\nlet pointer, scroller, response, screenshotImg\nlet scrollLastTimestamp, scrollLastValue\nlet mousePosX, mousePosY, mouseInitPosX, mouseInitPosY\nlet isLive = false\nlet wsLock = false\nlet isPointerLive = false\nlet isScreenshotWaiting = null\nlet isPointerScreenshotWaiting = false\nlet emptyImg = \"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4gIJDjc3srQk8gAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAADElEQVQI12P48+cPAAXsAvVTWDc6AAAAAElFTkSuQmCC\"\n\nfunction createWebSocketConnection() {\n const protocol = location.protocol === 'https:' ? 'wss' : 'ws'\n\n ws = new WebSocket(`${protocol}://${window.location.hostname}:${window.location.port}/ws`)\n\n ws.addEventListener('open', function(event) {\n document.querySelector('#disconneced').style.display = 'none'\n unLock()\n })\n\n ws.addEventListener('close', function(event) {\n unLock()\n document.querySelector('#disconneced').style.display = 'block'\n\n window.setTimeout(createWebSocketConnection, 5000)\n })\n\n ws.addEventListener('message', function(event) {\n unLock()\n let data = JSON.parse(event.data)\n\n if (data.type === 'response') {\n response.innerText = data.value\n response.style.display = 'block'\n\n window.setTimeout(function() {\n response.style.display = 'none'\n }, 2500)\n\n return\n }\n\n if (data.type === 'volume') {\n if (data.value.length) {\n setVolume(parseInt(data.value))\n }\n\n return\n }\n })\n}\n\nfunction isLocked() {\n return wsLock === true\n}\n\nfunction lock() {\n wsLock = true\n}\n\nfunction unLock() {\n wsLock = false\n}\n\nfunction send(message) {\n if (isLocked()) {\n return\n }\n\n lock()\n\n ws.send(message)\n}\n\nfunction navigationClickHandler(e) {\n if (e.target.getAttribute('href') === '#') {\n return\n }\n\n Array.from(document.querySelectorAll('.pane')).forEach((item) => {\n item.style.display = 'none'\n })\n\n document.querySelector(e.target.getAttribute('href')).style.display = 'block'\n\n Array.from(document.querySelectorAll('#nav a')).forEach((item) => {\n item.classList.remove('active')\n })\n\n e.target.classList.add('active')\n}\n\nfunction buttonClickHandler(e) {\n send(e.target.getAttribute('data-msg'))\n}\n\nfunction shortcutClearClickHandler(e) {\n document.querySelector('#shortcut-key').value = ''\n\n Array.from(document.querySelectorAll('#shortcuts_special_keys input:checked')).forEach((item) => {\n item.checked = false\n item.change()\n })\n}\n\nfunction shortcutSendClickHandler(e) {\n let keys = []\n let key = document.querySelector('#shortcut-key').value\n\n Array.from(document.querySelectorAll('#shortcuts_special_keys input:checked')).forEach((item) => {\n keys.push(item.value)\n })\n\n if (keys.length) {\n if (key) {\n keys.push(key)\n }\n\n send('{\"type\":\"keys\",\"value\": \"' + (keys.join(',').replace('\"', '\\\\\"')) + '\"}')\n }\n}\n\nfunction textClearClickHandler(e) {\n document.querySelector('#text').value = ''\n}\n\nfunction textSendClickHandler(e) {\n const keys = document.querySelector('#text').value\n\n if (keys.length) {\n send('{\"type\":\"text\",\"value\": \"' + (keys.replace('\"', '\\\\\"')) + '\"}')\n }\n}\n\nfunction textKeyUpHandler(e) {\n const keys = document.querySelector('#text').value\n\n if (e.keyCode === 13) {\n send('{\"type\":\"text\",\"value\": \"' + (keys.replace('\"', '\\\\\"')) + '\"}')\n }\n}\n\nfunction liveTextKeyUpHandler(e) {\n const value = e.target.value\n\n if (e.keyCode === 8) {\n send('{\"type\":\"key\",\"value\": \"backspace\"}')\n } else if (e.keyCode === 13) {\n send('{\"type\":\"key\",\"value\": \"enter\"}')\n } else if (value.length) {\n if (value === ' ') {\n send('{\"type\":\"key\",\"value\": \"space\"}')\n } else {\n send('{\"type\":\"text\",\"value\": \"' + (value.replace('\"', '\\\\\"')) + '\"}')\n }\n\n e.target.value = ''\n }\n}\n\nfunction shortcutsSpecialKeysOnChangeHandler(e) {\n Array.from(document.querySelectorAll('#shortcuts_special_keys input:checked')).forEach((item) => {\n item.parentNode.classList.add('btn-primary')\n item.parentNode.classList.remove('btn-secondary')\n })\n\n Array.from(document.querySelectorAll('#shortcuts_special_keys input:not(:checked)')).forEach((item) => {\n item.parentNode.classList.add('btn-secondary')\n item.parentNode.classList.remove('btn-primary')\n })\n}\n\nfunction pointerClickHandler(e) {\n send('{\"type\":\"pointer\",\"click\":\"left\"}')\n}\n\nfunction scrollerTouchStartHandler(e) {\n mouseInitPosY = e.targetTouches[0].pageY\n}\n\nfunction scrollerTouchMoveHandler(e) {\n let touch = e.changedTouches[0]\n let value = ((touch.pageY - mouseInitPosY > 0) ? 'down' : 'up')\n let now = new Date().getTime()\n\n if (touch.pageY === mouseInitPosY || value === scrollLastValue && scrollLastTimestamp !== null && now - scrollLastTimestamp < 200) {\n return\n }\n\n scrollLastTimestamp = now\n scrollLastValue = value\n mouseInitPosY = touch.pageY\n\n send('{\"type\":\"scroll\",\"value\": \"' + value + '\"}')\n}\n\nfunction pointerTouchStartHandler(e) {\n const touch = e.targetTouches[0]\n mouseInitPosX = touch.pageX\n mouseInitPosY = touch.pageY\n}\n\nfunction pointerLiveHandler(e) {\n if (!e.target.checked) {\n pointer.style.backgroundImage = \"\"\n } else {\n pointer.style.backgroundImage = `url(\"/capture?type=live&pointer=1&${Math.random()}\")`\n }\n}\n\nfunction pointerTouchMoveHandler(e) {\n if (e.changedTouches.length === 2) {\n return scrollerTouchMoveHandler(e)\n }\n\n const touch = e.changedTouches[0]\n mousePosX = touch.pageX\n mousePosY = touch.pageY\n\n const newX = mousePosX - mouseInitPosX\n const newY = mousePosY - mouseInitPosY\n\n mouseInitPosX = mousePosX\n mouseInitPosY = mousePosY\n\n let msg = '{\"type\":\"pointer\",\"x\": \"' + newX + '\",\"y\": \"' + newY + '\"}'\n\n ws.send(msg)\n}\n\nfunction capture(mode) {\n}\n\nfunction captureScreenshotClickHandler(e) {\n const img = e.target.parentNode.querySelector('.capture-img img')\n img.src = \"/capture?type=screenshot&\" + Math.random()\n}\n\nfunction captureLiveClickHandler(e) {\n const img = e.target.parentNode.querySelector('.capture-img img')\n\n if (img.src.indexOf(\"live\") > -1) {\n img.src = emptyImg\n } else {\n img.src = \"/capture?type=live&\" + Math.random()\n }\n}\n\nfunction fullscreenHandler(e) {\n const targetConf = e.target.getAttribute('data-target')\n const isFullscreen = parseInt(e.target.getAttribute('data-fullscreen'))\n const element = (targetConf === 'this')\n ? e.target\n : document.querySelector(targetConf)\n\n document.querySelector('body').classList.toggle('fullscreen', isFullscreen)\n\n if (isFullscreen) {\n e.target.setAttribute('data-fullscreen', '0')\n\n if (document.exitFullscreen) {\n document.exitFullscreen()\n } else if (document.webkitExitFullscreen) {\n document.webkitExitFullscreen()\n } else if (document.mozCancelFullScreen) {\n document.mozCancelFullScreen()\n }\n } else {\n e.target.setAttribute('data-fullscreen', '1')\n\n if (element.requestFullscreen) {\n element.requestFullscreen()\n } else if (element.webkitRequestFullscreen) {\n element.webkitRequestFullscreen()\n } else if (element.mozRequestFullScreen) {\n element.mozRequestFullScreen()\n }\n }\n}\n\nfunction documentHashHandler() {\n const hash = window.location.hash\n\n if (hash) {\n document.querySelector('a[href=\"' + hash + '\"]').click()\n } else {\n document.querySelector('#nav > li:first-child a').click()\n }\n}\n\nfunction addEventListenerOn(selector, eventName, listener) {\n if (typeof selector === 'string') {\n Array.from(document.querySelectorAll(selector)).forEach((element) => {\n element.addEventListener(eventName, listener)\n })\n } else {\n selector.addEventListener(eventName, listener)\n }\n}\n\nfunction addListeners() {\n addEventListenerOn('#nav a', 'click', navigationClickHandler)\n addEventListenerOn('button[data-msg]', 'click', buttonClickHandler)\n\n addEventListenerOn('#shortcut-clear', 'click', shortcutClearClickHandler)\n addEventListenerOn('#shortcuts_special_keys input', 'change', shortcutsSpecialKeysOnChangeHandler)\n addEventListenerOn('#shortcut-send', 'click', shortcutSendClickHandler)\n\n addEventListenerOn('#text-clear', 'click', textClearClickHandler)\n addEventListenerOn('#text-send', 'click', textSendClickHandler)\n addEventListenerOn('#text', 'keyup', textKeyUpHandler)\n addEventListenerOn('.live-text', 'keyup', liveTextKeyUpHandler)\n\n addEventListenerOn(scroller, 'touchstart', scrollerTouchStartHandler)\n addEventListenerOn(scroller, 'touchmove', scrollerTouchMoveHandler)\n\n addEventListenerOn(pointer, 'click', pointerClickHandler)\n addEventListenerOn(pointer, 'touchstart', pointerTouchStartHandler)\n addEventListenerOn(pointer, 'touchmove', pointerTouchMoveHandler)\n addEventListenerOn('#mouse-screenshot-live input', 'change', pointerLiveHandler)\n\n addEventListenerOn('.capture-live', 'click', captureLiveClickHandler)\n addEventListenerOn('.capture-screenshot', 'click', captureScreenshotClickHandler)\n\n addEventListenerOn('.btn-fullscreen', 'click', fullscreenHandler)\n}\n\nfunction getVolume() {\n if (document.querySelectorAll('.volume').length) {\n try {\n send('{\"type\":\"volume\",\"value\":\"value\"}')\n } catch (e) {\n }\n\n document.querySelectorAll('.volume input[type=\"range\"]').forEach(function(input) {\n if (input.getAttribute('data-event')) {\n return\n }\n\n input.setAttribute('data-event', 'ok')\n input.addEventListener('change', (e) => {\n send(`{\"type\":\"volume\",\"value\":\"${e.target.value}\"}`)\n })\n })\n }\n\n window.setTimeout(getVolume, 2000)\n}\n\nfunction setVolume(value) {\n document.querySelectorAll('.volume').forEach(function(item) {\n item.querySelector('input[type=\"range\"]').value = value\n })\n}\n\nfunction bootstrap() {\n pointer = document.querySelector('#pointer')\n scroller = document.querySelector('#scrollbar')\n response = document.querySelector('#response')\n screenshotImg = document.querySelector('#screenshot img')\n\n shortcutsSpecialKeysOnChangeHandler()\n createWebSocketConnection()\n addListeners()\n documentHashHandler()\n getVolume()\n\n if ('serviceWorker' in navigator) {\n navigator.serviceWorker.register('/static/js/service_worker.js')\n }\n}\n\naddEventListenerOn(window, 'DOMContentLoaded', bootstrap)\n"),
}
file9 := &embedded.EmbeddedFile{
Filename: "js/service_worker.js",
@@ -49,7 +49,7 @@ func init() {
}
dir2 := &embedded.EmbeddedDir{
Filename: "css",
- DirModTime: time.Unix(1745768085, 0),
+ DirModTime: time.Unix(1765482053, 0),
ChildFiles: []*embedded.EmbeddedFile{
file3, // "css/bootstrap.min.css"
file4, // "css/main.css"
@@ -66,7 +66,7 @@ func init() {
}
dir7 := &embedded.EmbeddedDir{
Filename: "js",
- DirModTime: time.Unix(1745775026, 0),
+ DirModTime: time.Unix(1765482326, 0),
ChildFiles: []*embedded.EmbeddedFile{
file8, // "js/main.js"
file9, // "js/service_worker.js"
diff --git a/static/css/main.css b/static/css/main.css
index 357e7cf..2544366 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -157,7 +157,7 @@ a {
display: none;
}
-#screenshot img {
+.capture-img img {
max-width: 100%;
margin-top: 10px;
cursor: pointer;
diff --git a/static/js/main.js b/static/js/main.js
index 825b27d..bb6b484 100644
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -7,6 +7,7 @@ let wsLock = false
let isPointerLive = false
let isScreenshotWaiting = null
let isPointerScreenshotWaiting = false
+let emptyImg = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH4gIJDjc3srQk8gAAAB1pVFh0Q29tbWVudAAAAAAAQ3JlYXRlZCB3aXRoIEdJTVBkLmUHAAAADElEQVQI12P48+cPAAXsAvVTWDc6AAAAAElFTkSuQmCC"
function createWebSocketConnection() {
const protocol = location.protocol === 'https:' ? 'wss' : 'ws'
@@ -24,7 +25,7 @@ function createWebSocketConnection() {
window.setTimeout(createWebSocketConnection, 5000)
})
-
+
ws.addEventListener('message', function(event) {
unLock()
let data = JSON.parse(event.data)
@@ -47,27 +48,6 @@ function createWebSocketConnection() {
return
}
-
- if (data.type === 'screenshot') {
- if (isScreenshotWaiting || isScreenshotWaiting === null) {
- if (isScreenshotWaiting) {
- isScreenshotWaiting = false
- }
-
- screenshotImg.setAttribute('src', 'data:image/png;base64, ' + data.value)
- }
-
- let pointer = document.querySelector('#pointer')
-
- if (isPointerScreenshotWaiting) {
- pointer.style.backgroundImage = `url('data:image/png;base64, ${data.value}')`
- isPointerScreenshotWaiting = false
- } else {
- pointer.style.backgroundImage = 'none'
- }
- }
-
- return
})
}
@@ -223,26 +203,10 @@ function pointerTouchStartHandler(e) {
function pointerLiveHandler(e) {
if (!e.target.checked) {
- isPointerLive = false
- isPointerScreenshotWaiting = null
-
- return
+ pointer.style.backgroundImage = ""
+ } else {
+ pointer.style.backgroundImage = `url("/capture?type=live&pointer=1&${Math.random()}")`
}
-
- isPointerLive = true
-
- let doScreenshot = function() {
- if (isPointerLive) {
- if (!isPointerScreenshotWaiting) {
- isPointerScreenshotWaiting = true
- ws.send(`{"type":"screenshot","quality":"lq","pointer":true}`)
- }
-
- window.setTimeout(doScreenshot, 300)
- }
- }
-
- doScreenshot()
}
function pointerTouchMoveHandler(e) {
@@ -265,46 +229,30 @@ function pointerTouchMoveHandler(e) {
ws.send(msg)
}
-function liveHqClickHandler(e) {
- return liveClickHandler(e, 'hq')
+function capture(mode) {
}
-function liveLqClickHandler(e) {
- return liveClickHandler(e, 'lq')
+function captureScreenshotClickHandler(e) {
+ const img = e.target.parentNode.querySelector('.capture-img img')
+ img.src = "/capture?type=screenshot&" + Math.random()
}
-function liveClickHandler(e, quality) {
- if (isLive) {
- isLive = false
- isScreenshotWaiting = null
+function captureLiveClickHandler(e) {
+ const img = e.target.parentNode.querySelector('.capture-img img')
- document.querySelector('#live-hq').innerText = 'Live HQ'
- document.querySelector('#live-lq').innerText = 'Live LQ'
-
- return
+ if (img.src.indexOf("live") > -1) {
+ img.src = emptyImg
+ } else {
+ img.src = "/capture?type=live&" + Math.random()
}
-
- isLive = true
-
- e.target.innerText = 'Stop live'
-
- let doScreenshot = function() {
- if (isLive) {
- if (!isScreenshotWaiting) {
- isScreenshotWaiting = true
- ws.send(`{"type":"screenshot","quality":"${quality}"}`)
- }
-
- window.setTimeout(doScreenshot, 100)
- }
- }
-
- doScreenshot()
}
function fullscreenHandler(e) {
- let element = document.querySelector(e.target.getAttribute('data-target'))
- let isFullscreen = parseInt(e.target.getAttribute('data-fullscreen'))
+ const targetConf = e.target.getAttribute('data-target')
+ const isFullscreen = parseInt(e.target.getAttribute('data-fullscreen'))
+ const element = (targetConf === 'this')
+ ? e.target
+ : document.querySelector(targetConf)
document.querySelector('body').classList.toggle('fullscreen', isFullscreen)
@@ -372,8 +320,9 @@ function addListeners() {
addEventListenerOn(pointer, 'touchmove', pointerTouchMoveHandler)
addEventListenerOn('#mouse-screenshot-live input', 'change', pointerLiveHandler)
- addEventListenerOn('#live-hq', 'click', liveHqClickHandler)
- addEventListenerOn('#live-lq', 'click', liveLqClickHandler)
+ addEventListenerOn('.capture-live', 'click', captureLiveClickHandler)
+ addEventListenerOn('.capture-screenshot', 'click', captureScreenshotClickHandler)
+
addEventListenerOn('.btn-fullscreen', 'click', fullscreenHandler)
}
diff --git a/views/page/home.html b/views/page/home.html
index 8780060..7fa8344 100644
--- a/views/page/home.html
+++ b/views/page/home.html
@@ -124,18 +124,17 @@
{{end}}
- {{if eq $value.Type "screenshot"}}
+ {{if eq $value.Type "capture"}}
-
-
-
- {{end}}
-
- {{if eq $value.Type "live_video"}}
-
-
-
-
+
+
+
+
+
