доработка README
This commit is contained in:
Maxim
@@ -3,6 +3,7 @@ package main
|
||||
import (
|
||||
"context"
|
||||
"embed"
|
||||
"encoding/binary"
|
||||
"encoding/json"
|
||||
"flag"
|
||||
"fmt"
|
||||
@@ -10,6 +11,10 @@ import (
|
||||
"io/fs"
|
||||
"log"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
@@ -33,6 +38,215 @@ func writeJSON(w http.ResponseWriter, v any) {
|
||||
json.NewEncoder(w).Encode(v)
|
||||
}
|
||||
|
||||
// HandleLogFiles - список доступных лог-файлов
|
||||
func (a *API) HandleLogFiles(w http.ResponseWriter, r *http.Request) {
|
||||
dataDir, err := logger.GetDataLogsDir()
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), 500)
|
||||
return
|
||||
}
|
||||
|
||||
files, err := filepath.Glob(filepath.Join(dataDir, "gpio-*.bin"))
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), 500)
|
||||
return
|
||||
}
|
||||
|
||||
type LogFileInfo struct {
|
||||
Name string `json:"name"`
|
||||
Path string `json:"path"`
|
||||
Size int64 `json:"size"`
|
||||
ModTime time.Time `json:"mod_time"`
|
||||
Time string `json:"time"`
|
||||
Date string `json:"date"`
|
||||
Hour int `json:"hour"`
|
||||
IsActive bool `json:"is_active"`
|
||||
}
|
||||
|
||||
var result []LogFileInfo
|
||||
for _, file := range files {
|
||||
info, err := os.Stat(file)
|
||||
if err != nil {
|
||||
continue
|
||||
}
|
||||
|
||||
// Парсим имя файла: gpio-2026-06-16-11.bin
|
||||
base := filepath.Base(file)
|
||||
parts := strings.Split(strings.TrimSuffix(base, ".bin"), "-")
|
||||
|
||||
var fileTime time.Time
|
||||
if len(parts) == 5 {
|
||||
year, _ := strconv.Atoi(parts[1])
|
||||
month, _ := strconv.Atoi(parts[2])
|
||||
day, _ := strconv.Atoi(parts[3])
|
||||
hour, _ := strconv.Atoi(parts[4])
|
||||
fileTime = time.Date(year, time.Month(month), day, hour, 0, 0, 0, time.Local)
|
||||
} else {
|
||||
fileTime = info.ModTime()
|
||||
}
|
||||
|
||||
result = append(result, LogFileInfo{
|
||||
Name: base,
|
||||
Path: file,
|
||||
Size: info.Size(),
|
||||
ModTime: info.ModTime(),
|
||||
Time: fileTime.Format("02.01.2006 15:00"),
|
||||
Date: fileTime.Format("2006-01-02"),
|
||||
Hour: fileTime.Hour(),
|
||||
IsActive: false,
|
||||
})
|
||||
}
|
||||
|
||||
// Сортируем по времени (новые сверху)
|
||||
sort.Slice(result, func(i, j int) bool {
|
||||
return result[i].ModTime.After(result[j].ModTime)
|
||||
})
|
||||
|
||||
writeJSON(w, result)
|
||||
}
|
||||
|
||||
// HandleLogData - чтение данных из конкретного bin файла
|
||||
func (a *API) HandleLogData(w http.ResponseWriter, r *http.Request) {
|
||||
filename := r.URL.Query().Get("file")
|
||||
if filename == "" {
|
||||
http.Error(w, "missing file parameter", 400)
|
||||
return
|
||||
}
|
||||
|
||||
// Защита от path traversal
|
||||
filename = filepath.Base(filename)
|
||||
dataDir, err := logger.GetDataLogsDir()
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), 500)
|
||||
return
|
||||
}
|
||||
|
||||
filePath := filepath.Join(dataDir, filename)
|
||||
if _, err := os.Stat(filePath); os.IsNotExist(err) {
|
||||
http.Error(w, "file not found", 404)
|
||||
return
|
||||
}
|
||||
|
||||
// Читаем бинарный файл
|
||||
f, err := os.Open(filePath)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), 500)
|
||||
return
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
type Sample struct {
|
||||
Timestamp int64 `json:"ts"`
|
||||
Time string `json:"time"`
|
||||
Value byte `json:"value"`
|
||||
Count byte `json:"count"`
|
||||
Strength byte `json:"strength"`
|
||||
StrengthName string `json:"strength_name"`
|
||||
}
|
||||
|
||||
var samples []Sample
|
||||
buf := make([]byte, 9) // 8 байт timestamp + 1 байт value
|
||||
|
||||
for {
|
||||
n, err := f.Read(buf)
|
||||
if err == io.EOF {
|
||||
break
|
||||
}
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), 500)
|
||||
return
|
||||
}
|
||||
if n < 9 {
|
||||
continue
|
||||
}
|
||||
|
||||
ts := int64(binary.LittleEndian.Uint64(buf[0:8]))
|
||||
value := buf[8]
|
||||
|
||||
data := logger.ParseGPIO(value)
|
||||
|
||||
samples = append(samples, Sample{
|
||||
Timestamp: ts,
|
||||
Time: time.UnixMicro(ts).Format("2006-01-02 15:04:05.000"),
|
||||
Value: value,
|
||||
Count: data.Count,
|
||||
Strength: data.Strength,
|
||||
StrengthName: logger.GetStrengthName(data.Strength),
|
||||
})
|
||||
}
|
||||
|
||||
// Ограничиваем количество точек для производительности
|
||||
if len(samples) > 10000 {
|
||||
// Берем каждую N-ю точку
|
||||
step := len(samples) / 10000
|
||||
var filtered []Sample
|
||||
for i := 0; i < len(samples); i += step {
|
||||
filtered = append(filtered, samples[i])
|
||||
}
|
||||
samples = filtered
|
||||
}
|
||||
|
||||
writeJSON(w, map[string]any{
|
||||
"filename": filename,
|
||||
"total": len(samples),
|
||||
"samples": samples,
|
||||
})
|
||||
}
|
||||
|
||||
// HandleLogEvents - чтение событий
|
||||
func (a *API) HandleLogEvents(w http.ResponseWriter, r *http.Request) {
|
||||
limit := 100
|
||||
if l := r.URL.Query().Get("limit"); l != "" {
|
||||
if parsed, err := strconv.Atoi(l); err == nil {
|
||||
limit = parsed
|
||||
}
|
||||
}
|
||||
|
||||
eventsPath, err := logger.GetEventHumanLogPath()
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), 500)
|
||||
return
|
||||
}
|
||||
|
||||
content, err := os.ReadFile(eventsPath)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), 500)
|
||||
return
|
||||
}
|
||||
|
||||
lines := strings.Split(string(content), "\n")
|
||||
// Берем последние N строк
|
||||
if len(lines) > limit+1 {
|
||||
lines = lines[len(lines)-limit-1:]
|
||||
}
|
||||
|
||||
// Парсим строки для JSON
|
||||
type Event struct {
|
||||
Time string `json:"time"`
|
||||
Event string `json:"event"`
|
||||
}
|
||||
|
||||
var events []Event
|
||||
for _, line := range lines {
|
||||
if line == "" {
|
||||
continue
|
||||
}
|
||||
// Формат: [2026-06-16 11:23:45.123] EVENT: СЕРВЕР_ЗАПУЩЕН
|
||||
parts := strings.SplitN(line, "] EVENT: ", 2)
|
||||
if len(parts) == 2 {
|
||||
events = append(events, Event{
|
||||
Time: strings.TrimPrefix(parts[0], "["),
|
||||
Event: parts[1],
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
writeJSON(w, map[string]any{
|
||||
"events": events,
|
||||
"total": len(events),
|
||||
})
|
||||
}
|
||||
|
||||
func (a *API) HandleHealth(w http.ResponseWriter, r *http.Request) {
|
||||
latest, ok := a.buf.GetLatest()
|
||||
idle := time.Since(a.buf.LastWriteTime())
|
||||
@@ -299,6 +513,12 @@ func main() {
|
||||
case "/cam":
|
||||
// Передаем URL камеры из конфигурации
|
||||
handleCamProxyWithURL(w, r, *cameraURL)
|
||||
case "/log/files":
|
||||
cors(api.HandleLogFiles)(w, r)
|
||||
case "/log/data":
|
||||
cors(api.HandleLogData)(w, r)
|
||||
case "/log/events":
|
||||
cors(api.HandleLogEvents)(w, r)
|
||||
default:
|
||||
http.Error(w, "not found", 404)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user