legacy: implement screenshot function.

This commit is contained in:
Miroslav Šedivý 2024-09-06 20:59:07 +02:00
parent 88b9663c7c
commit 0f4ee18f18
3 changed files with 65 additions and 41 deletions

View file

@ -4,7 +4,9 @@ import (
"encoding/json"
"errors"
"fmt"
"io"
"net/http"
"strconv"
"time"
"m1k1o/neko/internal/api"
@ -264,22 +266,22 @@ func (h *LegacyHandler) Route(r types.Router) {
return json.NewEncoder(w).Encode(stats)
})
/*
r.Get("/screenshot.jpg", func(w http.ResponseWriter, r *http.Request) error {
s := newSession(h.logger, h.serverAddr)
// create a new session
username := r.URL.Query().Get("usr")
password := r.URL.Query().Get("pwd")
isAdmin, err := webSocketHandler.IsAdmin(password)
err := s.create(username, password)
if err != nil {
return utils.HttpForbidden(err)
return utils.HttpForbidden(err.Error())
}
defer s.destroy()
if !isAdmin {
if !s.isAdmin {
return utils.HttpUnauthorized().Msg("bad authorization")
}
if webSocketHandler.IsLocked("login") {
return utils.HttpError(http.StatusLocked).Msg("room is locked")
}
quality, err := strconv.Atoi(r.URL.Query().Get("quality"))
if err != nil {
quality = 90
@ -288,14 +290,18 @@ func (h *LegacyHandler) Route(r types.Router) {
w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate")
w.Header().Set("Content-Type", "image/jpeg")
img := desktop.GetScreenshotImage()
if err := jpeg.Encode(w, img, &jpeg.Options{Quality: quality}); err != nil {
// get the screenshot
body, err := s.req(http.MethodGet, "/api/room/screen/shot.jpg?quality="+strconv.Itoa(quality), nil)
if err != nil {
return utils.HttpInternalServerError().WithInternalErr(err)
}
return nil
// copy the body to the response writer
_, err = io.Copy(w, body)
return err
})
/*
// allow downloading and uploading files
if webSocketHandler.FileTransferEnabled() {
r.Get("/file", func(w http.ResponseWriter, r *http.Request) error {

View file

@ -57,15 +57,15 @@ func newSession(logger zerolog.Logger, serverAddr string) *session {
}
}
func (s *session) apiReq(method, path string, request, response any) error {
func (s *session) req(method, path string, request any) (io.ReadCloser, error) {
body, err := json.Marshal(request)
if err != nil {
return err
return nil, err
}
req, err := http.NewRequest(method, "http://"+s.serverAddr+path, bytes.NewReader(body))
if err != nil {
return err
return nil, err
}
req.Header.Set("Content-Type", "application/json")
@ -76,33 +76,44 @@ func (s *session) apiReq(method, path string, request, response any) error {
res, err := s.client.Do(req)
if err != nil {
return err
return nil, err
}
defer res.Body.Close()
if res.StatusCode < 200 || res.StatusCode >= 300 {
defer res.Body.Close()
body, _ := io.ReadAll(res.Body)
// try to unmarsal as json error message
var apiErr struct {
Message string `json:"message"`
}
if err := json.Unmarshal(body, &apiErr); err == nil {
return fmt.Errorf("%w: %s", ErrBackendRespone, apiErr.Message)
return nil, fmt.Errorf("%w: %s", ErrBackendRespone, apiErr.Message)
}
// return raw body if failed to unmarshal
return fmt.Errorf("unexpected status code: %d, body: %s", res.StatusCode, strings.TrimSpace(string(body)))
return nil, fmt.Errorf("unexpected status code: %d, body: %s", res.StatusCode, strings.TrimSpace(string(body)))
}
if res.Body == nil {
return res.Body, nil
}
func (s *session) apiReq(method, path string, request, response any) error {
body, err := s.req(method, path, request)
if err != nil {
return err
}
defer body.Close()
if body == nil {
return nil
}
if response == nil {
io.Copy(io.Discard, res.Body)
io.Copy(io.Discard, body)
return nil
}
return json.NewDecoder(res.Body).Decode(response)
return json.NewDecoder(body).Decode(response)
}
// send message to client (in old format)

View file

@ -703,6 +703,13 @@ paths:
- room
summary: get screenshot image
operationId: screenShotImage
parameters:
- in: query
name: quality
description: image quality (0-100)
required: false
schema:
type: integer
responses:
'200':
description: OK