Compare commits
3 Commits
33f7775800
...
main
Author | SHA1 | Date | |
---|---|---|---|
![]() |
11b48c548e | ||
![]() |
9585fb1b7a | ||
![]() |
a648be3bcb |
@@ -6,29 +6,8 @@ on:
|
||||
- '*'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
- os: windows-latest
|
||||
goos: windows
|
||||
arch: amd64
|
||||
ext: .exe
|
||||
- os: ubuntu-latest
|
||||
goos: linux
|
||||
arch: amd64
|
||||
ext: ""
|
||||
- os: ubuntu-latest
|
||||
goos: linux
|
||||
arch: arm64
|
||||
ext: ""
|
||||
- os: ubuntu-latest
|
||||
goos: linux
|
||||
arch: arm
|
||||
arm_version: 6
|
||||
ext: ""
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
||||
build-spa:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
@@ -38,7 +17,7 @@ jobs:
|
||||
with:
|
||||
node-version: '20'
|
||||
|
||||
- name: Install dependecies
|
||||
- name: Install dependencies
|
||||
run: npm install
|
||||
|
||||
- name: Install Quasar CLI
|
||||
@@ -49,6 +28,41 @@ jobs:
|
||||
- name: Build Quasar SPA
|
||||
run: quasar build
|
||||
|
||||
- name: Upload SPA artifact
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: quasar-dist
|
||||
path: ./dist/spa
|
||||
|
||||
build-backend:
|
||||
needs: build-spa
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
- goos: windows
|
||||
arch: amd64
|
||||
ext: .exe
|
||||
- goos: linux
|
||||
arch: amd64
|
||||
ext: ""
|
||||
- goos: linux
|
||||
arch: arm64
|
||||
ext: ""
|
||||
- goos: linux
|
||||
arch: arm
|
||||
arm_version: 6
|
||||
ext: ""
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Download SPA artifact
|
||||
uses: actions/download-artifact@v3
|
||||
with:
|
||||
name: quasar-dist
|
||||
path: ./dist/spa
|
||||
|
||||
- name: Ensure latest Go is installed in /data/go
|
||||
run: |
|
||||
export GOROOT=/data/go/go
|
||||
@@ -59,10 +73,8 @@ jobs:
|
||||
|
||||
if [ ! -x "$GOROOT/bin/go" ]; then
|
||||
echo "Go not found in $GOROOT, downloading latest stable..."
|
||||
|
||||
GO_VERSION=$(curl -s https://go.dev/VERSION?m=text | head -n1)
|
||||
echo "Latest version is $GO_VERSION"
|
||||
|
||||
mkdir -p /data/go
|
||||
curl -sSL "https://go.dev/dl/${GO_VERSION}.linux-amd64.tar.gz" -o /tmp/go.tar.gz
|
||||
tar -C /data/go -xzf /tmp/go.tar.gz
|
||||
@@ -83,7 +95,7 @@ jobs:
|
||||
go mod tidy -v
|
||||
go mod download
|
||||
|
||||
- name: Build go backend binary
|
||||
- name: Build Go backend binary
|
||||
working-directory: ./backend
|
||||
run: |
|
||||
export GOROOT=/data/go/go
|
||||
@@ -92,17 +104,17 @@ jobs:
|
||||
export GOMODCACHE=/data/gomodcache
|
||||
mkdir -p $GOCACHE $GOMODCACHE
|
||||
|
||||
OUTPUT="../server-${{ matrix.goos }}-${{ matrix.goarch }}"
|
||||
if [ "${{ matrix.goos }}" == "windows" ]; then
|
||||
OUTPUT="${OUTPUT}.exe"
|
||||
OUTPUT="../server-${{ matrix.goos }}-${{ matrix.arch }}${{ matrix.ext }}"
|
||||
if [ "${{ matrix.arch }}" = "arm" ]; then
|
||||
GOARM=${{ matrix.arm_version }}
|
||||
fi
|
||||
|
||||
GOOS=${{ matrix.goos }} GOARCH=${{ matrix.goarch }} go build -ldflags="-s -w" -trimpath -o "$OUTPUT" main.go
|
||||
GOOS=${{ matrix.goos }} GOARCH=${{ matrix.arch }} go build -ldflags="-s -w" -trimpath -o "$OUTPUT" main.go
|
||||
|
||||
- name: Upload build artifacts
|
||||
- name: Upload combined package
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: lightcontroller-${{ matrix.goos }}-${{ matrix.goarch }}
|
||||
name: lightcontroller-${{ matrix.goos }}-${{ matrix.arch }}
|
||||
path: |
|
||||
./dist/spa
|
||||
server-${{ matrix.goos }}-${{ matrix.goarch }}${{ (matrix.goos == 'windows' && '.exe') || '' }}
|
||||
server-${{ matrix.goos }}-${{ matrix.arch }}${{ matrix.ext }}
|
||||
|
BIN
backend/dist/bin/tecamino-driver-artNet-linux-arm64
vendored
BIN
backend/dist/bin/tecamino-driver-artNet-linux-arm64
vendored
Binary file not shown.
1
backend/dist/cfg/configuration.json
vendored
Executable file
1
backend/dist/cfg/configuration.json
vendored
Executable file
@@ -0,0 +1 @@
|
||||
{"services":[{"name":"ArtNet Driver","description":"ArtNet Driver DMX over UDP/IP","executablePath":"../../tecamino-driver-artNet/artNet","workingDirectory":"../../tecamino-driver-artNet","arguments":["-cfg ./dist/cfg","-serverIp 127.0.0.1","-serverPort 8100","-port 8200"]}]}
|
5
backend/dist/cfg/defaultConfigurations.json
vendored
5
backend/dist/cfg/defaultConfigurations.json
vendored
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"drivers":[{
|
||||
"name":"ArtNet",
|
||||
"cfgFileName": "configuration.json",
|
||||
"services":[{
|
||||
"name":"ArtNet Driver",
|
||||
"description":"ArtNet Driver DMX over UDP/IP",
|
||||
"executablePath":"bin/tecamino-driver-artNet-linux-arm64",
|
||||
"workingDirectory":"bin",
|
||||
|
@@ -1,36 +0,0 @@
|
||||
package drivers
|
||||
|
||||
import (
|
||||
"backend/models"
|
||||
"encoding/json"
|
||||
"net/http"
|
||||
"os"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
type DriverHandler struct {
|
||||
driversConfig string
|
||||
}
|
||||
|
||||
func NewDriverHandler(cfgDir string) *DriverHandler {
|
||||
return &DriverHandler{driversConfig: cfgDir}
|
||||
}
|
||||
|
||||
func (dH *DriverHandler) GetDriverList(c *gin.Context) {
|
||||
content, err := os.ReadFile(dH.driversConfig)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||
return
|
||||
}
|
||||
|
||||
var data struct {
|
||||
Drivers []models.Drivers `json:"drivers"`
|
||||
}
|
||||
err = json.Unmarshal(content, &data)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||
return
|
||||
}
|
||||
c.JSON(http.StatusOK, data.Drivers)
|
||||
}
|
@@ -5,27 +5,31 @@ go 1.24.0
|
||||
toolchain go1.24.3
|
||||
|
||||
require (
|
||||
gitea.tecamino.com/paadi/statusServer v1.0.3
|
||||
gitea.tecamino.com/paadi/tecamino-dbm v0.1.1
|
||||
gitea.tecamino.com/paadi/tecamino-logger v0.2.1
|
||||
github.com/gin-contrib/cors v1.7.5
|
||||
github.com/gin-gonic/gin v1.10.0
|
||||
github.com/gin-contrib/cors v1.7.6
|
||||
github.com/gin-gonic/gin v1.10.1
|
||||
github.com/golang-jwt/jwt/v5 v5.2.2
|
||||
github.com/google/uuid v1.6.0
|
||||
golang.org/x/crypto v0.36.0
|
||||
golang.org/x/crypto v0.39.0
|
||||
modernc.org/sqlite v1.37.1
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/bytedance/sonic v1.13.2 // indirect
|
||||
gitea.tecamino.com/paadi/pubSub v1.0.2 // indirect
|
||||
gitea.tecamino.com/paadi/tecamino-json_data v0.1.0 // indirect
|
||||
github.com/bytedance/sonic v1.13.3 // indirect
|
||||
github.com/bytedance/sonic/loader v0.2.4 // indirect
|
||||
github.com/cloudwego/base64x v0.1.5 // indirect
|
||||
github.com/dustin/go-humanize v1.0.1 // indirect
|
||||
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
|
||||
github.com/gin-contrib/sse v1.0.0 // indirect
|
||||
github.com/gabriel-vasile/mimetype v1.4.9 // indirect
|
||||
github.com/gin-contrib/sse v1.1.0 // indirect
|
||||
github.com/go-playground/locales v0.14.1 // indirect
|
||||
github.com/go-playground/universal-translator v0.18.1 // indirect
|
||||
github.com/go-playground/validator/v10 v10.26.0 // indirect
|
||||
github.com/goccy/go-json v0.10.5 // indirect
|
||||
github.com/gorilla/websocket v1.5.3 // indirect
|
||||
github.com/json-iterator/go v1.1.12 // indirect
|
||||
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
|
||||
github.com/leodido/go-urn v1.4.0 // indirect
|
||||
@@ -33,17 +37,17 @@ require (
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
|
||||
github.com/modern-go/reflect2 v1.0.2 // indirect
|
||||
github.com/ncruces/go-strftime v0.1.9 // indirect
|
||||
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
|
||||
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
|
||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
|
||||
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
|
||||
github.com/ugorji/go/codec v1.2.12 // indirect
|
||||
github.com/ugorji/go/codec v1.3.0 // indirect
|
||||
go.uber.org/multierr v1.10.0 // indirect
|
||||
go.uber.org/zap v1.27.0 // indirect
|
||||
golang.org/x/arch v0.15.0 // indirect
|
||||
golang.org/x/arch v0.18.0 // indirect
|
||||
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
|
||||
golang.org/x/net v0.38.0 // indirect
|
||||
golang.org/x/net v0.41.0 // indirect
|
||||
golang.org/x/sys v0.33.0 // indirect
|
||||
golang.org/x/text v0.23.0 // indirect
|
||||
golang.org/x/text v0.26.0 // indirect
|
||||
google.golang.org/protobuf v1.36.6 // indirect
|
||||
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
|
@@ -1,9 +1,15 @@
|
||||
gitea.tecamino.com/paadi/pubSub v1.0.2 h1:9Q9KLTIHRSjxrTkDyuF8mDYOLkI8DjjPNSnoS2GKflY=
|
||||
gitea.tecamino.com/paadi/pubSub v1.0.2/go.mod h1:SBPTSD/JQWRbwqsSNoSPhV81IDTreP0TMyvLhmK3P2M=
|
||||
gitea.tecamino.com/paadi/statusServer v1.0.3 h1:bRw+Jz9AIoiwqNLTBnrus2aUxq2Em2gA8NDANtqVHEA=
|
||||
gitea.tecamino.com/paadi/statusServer v1.0.3/go.mod h1:kNO/ASrrmsLGgo+k49TLpVP6PpxG3I3D1moJ6Ke+ocg=
|
||||
gitea.tecamino.com/paadi/tecamino-dbm v0.1.1 h1:vAq7mwUxlxJuLzCQSDMrZCwo8ky5usWi9Qz+UP+WnkI=
|
||||
gitea.tecamino.com/paadi/tecamino-dbm v0.1.1/go.mod h1:+tmf1rjPaKEoNeUcr1vdtoFIFweNG3aUGevDAl3NMBk=
|
||||
gitea.tecamino.com/paadi/tecamino-json_data v0.1.0 h1:zp3L8qUvkVqzuesQdMh/SgZZZbX3pGD9NYa6jtz+JvA=
|
||||
gitea.tecamino.com/paadi/tecamino-json_data v0.1.0/go.mod h1:/FKhbVYuhiNlQp4552rJJQIhynjLarDzfrgXpupkwZU=
|
||||
gitea.tecamino.com/paadi/tecamino-logger v0.2.1 h1:sQTBKYPdzn9mmWX2JXZBtGBvNQH7cuXIwsl4TD0aMgE=
|
||||
gitea.tecamino.com/paadi/tecamino-logger v0.2.1/go.mod h1:FkzRTldUBBOd/iy2upycArDftSZ5trbsX5Ira5OzJgM=
|
||||
github.com/bytedance/sonic v1.13.2 h1:8/H1FempDZqC4VqjptGo14QQlJx8VdZJegxs6wwfqpQ=
|
||||
github.com/bytedance/sonic v1.13.2/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
|
||||
github.com/bytedance/sonic v1.13.3 h1:MS8gmaH16Gtirygw7jV91pDCN33NyMrPbN7qiYhEsF0=
|
||||
github.com/bytedance/sonic v1.13.3/go.mod h1:o68xyaF9u2gvVBuGHPlUVCy+ZfmNNO5ETf1+KgkJhz4=
|
||||
github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
|
||||
github.com/bytedance/sonic/loader v0.2.4 h1:ZWCw4stuXUsn1/+zQDqeE7JKP+QO47tz7QCNan80NzY=
|
||||
github.com/bytedance/sonic/loader v0.2.4/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI=
|
||||
@@ -15,14 +21,14 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
|
||||
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
|
||||
github.com/gabriel-vasile/mimetype v1.4.8 h1:FfZ3gj38NjllZIeJAmMhr+qKL8Wu+nOoI3GqacKw1NM=
|
||||
github.com/gabriel-vasile/mimetype v1.4.8/go.mod h1:ByKUIKGjh1ODkGM1asKUbQZOLGrPjydw3hYPU2YU9t8=
|
||||
github.com/gin-contrib/cors v1.7.5 h1:cXC9SmofOrRg0w9PigwGlHG3ztswH6bqq4vJVXnvYMk=
|
||||
github.com/gin-contrib/cors v1.7.5/go.mod h1:4q3yi7xBEDDWKapjT2o1V7mScKDDr8k+jZ0fSquGoy0=
|
||||
github.com/gin-contrib/sse v1.0.0 h1:y3bT1mUWUxDpW4JLQg/HnTqV4rozuW4tC9eFKTxYI9E=
|
||||
github.com/gin-contrib/sse v1.0.0/go.mod h1:zNuFdwarAygJBht0NTKiSi3jRf6RbqeILZ9Sp6Slhe0=
|
||||
github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
|
||||
github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
|
||||
github.com/gabriel-vasile/mimetype v1.4.9 h1:5k+WDwEsD9eTLL8Tz3L0VnmVh9QxGjRmjBvAG7U/oYY=
|
||||
github.com/gabriel-vasile/mimetype v1.4.9/go.mod h1:WnSQhFKJuBlRyLiKohA/2DtIlPFAbguNaG7QCHcyGok=
|
||||
github.com/gin-contrib/cors v1.7.6 h1:3gQ8GMzs1Ylpf70y8bMw4fVpycXIeX1ZemuSQIsnQQY=
|
||||
github.com/gin-contrib/cors v1.7.6/go.mod h1:Ulcl+xN4jel9t1Ry8vqph23a60FwH9xVLd+3ykmTjOk=
|
||||
github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w=
|
||||
github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM=
|
||||
github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ=
|
||||
github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
|
||||
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
|
||||
github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
|
||||
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
|
||||
@@ -35,13 +41,15 @@ github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
|
||||
github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
|
||||
github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
|
||||
github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
|
||||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
|
||||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
|
||||
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
|
||||
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
|
||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
|
||||
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
|
||||
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
|
||||
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
|
||||
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
|
||||
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
|
||||
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
|
||||
github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
|
||||
@@ -63,8 +71,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
|
||||
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
|
||||
github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
|
||||
github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
|
||||
github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
|
||||
github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
|
||||
github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
|
||||
github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
|
||||
@@ -74,42 +82,40 @@ github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6po
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
|
||||
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
|
||||
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
|
||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
|
||||
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
||||
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
|
||||
github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
|
||||
github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
|
||||
github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
|
||||
github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA=
|
||||
github.com/ugorji/go/codec v1.3.0/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4=
|
||||
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
|
||||
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
|
||||
go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
|
||||
go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
|
||||
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
|
||||
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
|
||||
golang.org/x/arch v0.15.0 h1:QtOrQd0bTUnhNVNndMpLHNWrDmYzZ2KDqSrEymqInZw=
|
||||
golang.org/x/arch v0.15.0/go.mod h1:JmwW7aLIoRUKgaTzhkiEFxvcEiQGyOg9BMonBJUS7EE=
|
||||
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
|
||||
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
|
||||
golang.org/x/arch v0.18.0 h1:WN9poc33zL4AzGxqf8VtpKUnGvMi8O9lhNyBMF/85qc=
|
||||
golang.org/x/arch v0.18.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk=
|
||||
golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
|
||||
golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
|
||||
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0 h1:R84qjqJb5nVJMxqWYb3np9L5ZsaDtB+a39EqjV0JSUM=
|
||||
golang.org/x/exp v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:S9Xr4PYopiDyqSyp5NjCrhFrqg6A5zA2E/iPHPhqnS8=
|
||||
golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
|
||||
golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
|
||||
golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
|
||||
golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
|
||||
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
|
||||
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
|
||||
golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
|
||||
golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
|
||||
golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
|
||||
golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
|
||||
golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
|
||||
golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
|
||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
|
||||
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
||||
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
|
||||
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
|
||||
golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
|
||||
golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
|
||||
golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
|
||||
golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
|
||||
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
|
||||
|
@@ -1,11 +1,11 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"backend/drivers"
|
||||
"backend/login"
|
||||
"backend/models"
|
||||
secenes "backend/scenes"
|
||||
"backend/server"
|
||||
"backend/services"
|
||||
"backend/utils"
|
||||
"flag"
|
||||
"fmt"
|
||||
@@ -16,6 +16,7 @@ import (
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"gitea.tecamino.com/paadi/statusServer"
|
||||
"gitea.tecamino.com/paadi/tecamino-logger/logging"
|
||||
"github.com/gin-contrib/cors"
|
||||
"github.com/gin-gonic/gin"
|
||||
@@ -29,7 +30,7 @@ func main() {
|
||||
|
||||
spa := flag.String("spa", "./dist/spa", "quasar spa files")
|
||||
cfgDir := flag.String("cfg", "./cfg", "config dir")
|
||||
driversCfg := flag.String("drivers", "defaultConfigurations.json", "drivers config file name")
|
||||
servicesCfg := flag.String("services", "defaultConfigurations.json", "services config file name")
|
||||
workingDir := flag.String("workingDirectory", ".", "quasar spa files")
|
||||
ip := flag.String("ip", "0.0.0.0", "server listening ip")
|
||||
port := flag.Uint("port", 9500, "server listening port")
|
||||
@@ -38,7 +39,6 @@ func main() {
|
||||
|
||||
//change working directory only if value is given
|
||||
if *workingDir != "." && *workingDir != "" {
|
||||
fmt.Println(1, *workingDir)
|
||||
os.Chdir(*workingDir)
|
||||
}
|
||||
|
||||
@@ -73,17 +73,24 @@ func main() {
|
||||
scenesHandler := secenes.NewScenesHandler("")
|
||||
|
||||
//new scenes handler
|
||||
driversHandler := drivers.NewDriverHandler(filepath.Join(*cfgDir, *driversCfg))
|
||||
servicesHandler := services.NewServicesHandler(*cfgDir, *servicesCfg)
|
||||
|
||||
// new server
|
||||
s := server.NewServer()
|
||||
|
||||
// new status websocket
|
||||
statusWs, err := statusServer.NewStatusWebsocket(5, 256, logger)
|
||||
if err != nil {
|
||||
logger.Error("main", fmt.Sprintf("initialize status websocket: %s", err.Error()))
|
||||
}
|
||||
|
||||
servicesHandler.LinkStatusServer(statusWs)
|
||||
//get local ip
|
||||
allowOrigins = append(allowOrigins, "http://localhost:9000", "http://localhost:9500")
|
||||
|
||||
localIP, err := utils.GetLocalIP()
|
||||
if err != nil {
|
||||
logger.Error("main", fmt.Sprintf("get local ip : %s", err.Error()))
|
||||
logger.Error("main", fmt.Sprintf("get local ip: %s", err.Error()))
|
||||
} else {
|
||||
allowOrigins = append(allowOrigins, fmt.Sprintf("http://%s:9000", localIP), fmt.Sprintf("http://%s:9500", localIP))
|
||||
}
|
||||
@@ -97,14 +104,21 @@ func main() {
|
||||
|
||||
api := s.Routes.Group("/api")
|
||||
//set routes
|
||||
api.GET("/loadScenes", scenesHandler.LoadScenes)
|
||||
api.GET("/allDrivers", driversHandler.GetDriverList)
|
||||
api.GET("/status", statusWs.NewConection)
|
||||
api.GET("/scenes/all", scenesHandler.LoadScenes)
|
||||
api.GET("/services/all", servicesHandler.GetAllAvaiableServices)
|
||||
api.GET("/services/load", servicesHandler.LoadAllServices)
|
||||
api.GET("/services/:service/start", servicesHandler.StartService)
|
||||
api.GET("/services/:service/stop", servicesHandler.StopService)
|
||||
api.POST("/login", loginManager.Login)
|
||||
api.POST("/user/add", loginManager.AddUser)
|
||||
api.POST("/saveScene", scenesHandler.SaveScene)
|
||||
api.POST("/loadScene", scenesHandler.LoadScene)
|
||||
api.DELETE("/user", loginManager.RemoveUser)
|
||||
api.DELETE("/deleteScene", scenesHandler.DeleteScene)
|
||||
api.POST("/scenes/save", scenesHandler.SaveScene)
|
||||
api.POST("/scenes/load", scenesHandler.LoadScene)
|
||||
api.POST("/services/add", servicesHandler.AddNewService)
|
||||
|
||||
api.DELETE("/user",
|
||||
loginManager.RemoveUser)
|
||||
api.DELETE("/scenes", scenesHandler.DeleteScene)
|
||||
|
||||
// Serve static files
|
||||
s.Routes.StaticFS("/assets", gin.Dir(filepath.Join(*spa, "assets"), true))
|
||||
|
6
backend/models/configuration.go
Normal file
6
backend/models/configuration.go
Normal file
@@ -0,0 +1,6 @@
|
||||
package models
|
||||
|
||||
type Configuration struct {
|
||||
CfgFileName string `json:"cfgFileName,omitempty"`
|
||||
Services []Service `json:"services,omitempty"`
|
||||
}
|
@@ -1,9 +0,0 @@
|
||||
package models
|
||||
|
||||
type Drivers struct {
|
||||
Name string `json:"name"`
|
||||
Description string `json:"description"`
|
||||
ExecutablePath string `json:"executablePath,omitempty"`
|
||||
WorkingDirectory string `json:"workingDirectory,omitempty"`
|
||||
Arguments []string `json:"arguments,omitempty"`
|
||||
}
|
80
backend/models/service.go
Normal file
80
backend/models/service.go
Normal file
@@ -0,0 +1,80 @@
|
||||
package models
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"os"
|
||||
"os/exec"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type Service struct {
|
||||
Name string `json:"name"`
|
||||
Description string `json:"description"`
|
||||
ExecutablePath string `json:"executablePath,omitempty"`
|
||||
WorkingDirectory string `json:"workingDirectory,omitempty"`
|
||||
Arguments []string `json:"arguments,omitempty"`
|
||||
State string `json:"-"`
|
||||
Cmd *exec.Cmd `json:"-"`
|
||||
Stopping bool `json:"-"`
|
||||
}
|
||||
|
||||
func (s *Service) Start(errFunc func(e string)) error {
|
||||
s.State = "Error"
|
||||
absolutePath, err := filepath.Abs(s.ExecutablePath)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var arguments []string
|
||||
|
||||
for _, a := range s.Arguments {
|
||||
arguments = append(arguments, strings.Split(a, " ")...)
|
||||
}
|
||||
s.Cmd = exec.Command(absolutePath, arguments...)
|
||||
s.Cmd.Dir = s.WorkingDirectory
|
||||
s.Cmd.Stdout = os.Stdout
|
||||
s.Cmd.Stderr = os.Stderr
|
||||
|
||||
err = s.Cmd.Start()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
go func() {
|
||||
err := s.Cmd.Wait()
|
||||
if err != nil {
|
||||
// Process exited with error
|
||||
if exitErr, ok := err.(*exec.ExitError); ok {
|
||||
if !s.Stopping {
|
||||
errFunc(fmt.Sprintf("Command failed with exit code %d: %v", exitErr.ExitCode(), err))
|
||||
}
|
||||
} else {
|
||||
errFunc(fmt.Sprintf("Command wait error: %v", err))
|
||||
}
|
||||
}
|
||||
s.Stopping = false
|
||||
}()
|
||||
|
||||
s.State = "Running"
|
||||
return nil
|
||||
}
|
||||
|
||||
func (s *Service) Stop() error {
|
||||
s.State = "Error"
|
||||
|
||||
if s.Cmd == nil {
|
||||
return errors.New("process nil pointer")
|
||||
}
|
||||
|
||||
// Stop (kill) the process
|
||||
s.Stopping = true
|
||||
err := s.Cmd.Process.Kill()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
s.State = "Stopped"
|
||||
return nil
|
||||
}
|
260
backend/services/services.go
Normal file
260
backend/services/services.go
Normal file
@@ -0,0 +1,260 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"backend/models"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"gitea.tecamino.com/paadi/statusServer"
|
||||
"github.com/gin-gonic/gin"
|
||||
)
|
||||
|
||||
type ServicesHandler struct {
|
||||
cfgDir string
|
||||
cfgFile string
|
||||
config models.Configuration
|
||||
statusWs *statusServer.StatusWebsocket
|
||||
}
|
||||
|
||||
func NewServicesHandler(cfgDir, cfgFile string) *ServicesHandler {
|
||||
return &ServicesHandler{cfgDir: cfgDir, cfgFile: cfgFile}
|
||||
}
|
||||
|
||||
func (s *ServicesHandler) LinkStatusServer(statusServer *statusServer.StatusWebsocket) {
|
||||
s.statusWs = statusServer
|
||||
}
|
||||
|
||||
func (s *ServicesHandler) GetAllAvaiableServices(c *gin.Context) {
|
||||
var services []models.Service
|
||||
|
||||
defaultCfg, err := s.readDefaultConfig()
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||
return
|
||||
}
|
||||
|
||||
configFile := filepath.Join(s.cfgDir, defaultCfg.CfgFileName)
|
||||
if _, err := os.Stat(configFile); err != nil {
|
||||
c.JSON(http.StatusOK, gin.H{"services": defaultCfg.Services})
|
||||
return
|
||||
}
|
||||
|
||||
content, err := os.ReadFile(configFile)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||
return
|
||||
}
|
||||
|
||||
var cfg models.Configuration
|
||||
err = json.Unmarshal(content, &cfg)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||
return
|
||||
}
|
||||
|
||||
// check wether service was already initiated then skip
|
||||
next:
|
||||
for _, new := range defaultCfg.Services {
|
||||
for _, old := range cfg.Services {
|
||||
if new.Name == old.Name {
|
||||
continue next
|
||||
}
|
||||
}
|
||||
services = append(services, new)
|
||||
}
|
||||
c.JSON(http.StatusOK, gin.H{"services": services})
|
||||
}
|
||||
|
||||
func (s *ServicesHandler) LoadAllServices(c *gin.Context) {
|
||||
|
||||
defaultCfg, err := s.readDefaultConfig()
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||
return
|
||||
}
|
||||
|
||||
configFile := filepath.Join(s.cfgDir, defaultCfg.CfgFileName)
|
||||
if _, err := os.Stat(configFile); err != nil {
|
||||
c.JSON(http.StatusOK, gin.H{"message": "no services"})
|
||||
return
|
||||
}
|
||||
|
||||
content, err := os.ReadFile(configFile)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||
return
|
||||
}
|
||||
|
||||
err = json.Unmarshal(content, &s.config)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||
return
|
||||
}
|
||||
|
||||
if len(s.config.Services) == 0 {
|
||||
c.JSON(http.StatusOK, gin.H{"message": "no services"})
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, gin.H{"services": s.config.Services})
|
||||
}
|
||||
|
||||
func (s *ServicesHandler) AddNewService(c *gin.Context) {
|
||||
body, err := io.ReadAll(c.Request.Body)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||
return
|
||||
}
|
||||
|
||||
var newService struct {
|
||||
Name string `json:"name"`
|
||||
}
|
||||
|
||||
err = json.Unmarshal(body, &newService)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||
return
|
||||
}
|
||||
|
||||
defaultCfg, err := s.readDefaultConfig()
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||
return
|
||||
}
|
||||
|
||||
var config models.Configuration
|
||||
|
||||
if _, err := os.Stat(filepath.Join(s.cfgDir, defaultCfg.CfgFileName)); err == nil {
|
||||
content, err := os.ReadFile(filepath.Join(s.cfgDir, defaultCfg.CfgFileName))
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||
return
|
||||
}
|
||||
err = json.Unmarshal(content, &config)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
for _, service := range defaultCfg.Services {
|
||||
if service.Name == newService.Name {
|
||||
config.Services = append(config.Services, service)
|
||||
|
||||
f, err := os.OpenFile(filepath.Join(s.cfgDir, defaultCfg.CfgFileName), os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0774)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||
return
|
||||
}
|
||||
defer f.Close()
|
||||
|
||||
output, err := json.Marshal(config)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||
return
|
||||
}
|
||||
|
||||
_, err = f.Write(output)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, gin.H{"message": "service '" + newService.Name + "' added"})
|
||||
return
|
||||
}
|
||||
}
|
||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(errors.New("no service '"+newService.Name+"' found")))
|
||||
}
|
||||
|
||||
func (s *ServicesHandler) StartService(c *gin.Context) {
|
||||
service := c.Param("service")
|
||||
|
||||
s.statusWs.Publish("status/"+service, gin.H{
|
||||
"state": "Starting",
|
||||
})
|
||||
|
||||
for i := range s.config.Services {
|
||||
if s.config.Services[i].Name == service {
|
||||
if err := s.config.Services[i].Start(func(e string) {
|
||||
s.statusWs.Publish("status/"+service, gin.H{"state": "Error", "message": e})
|
||||
}); err != nil {
|
||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorResponse(err))
|
||||
s.statusWs.Publish("status/"+service, gin.H{
|
||||
"state": "Error",
|
||||
"message": err.Error(),
|
||||
})
|
||||
return
|
||||
}
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"message": fmt.Sprintf("service '%s' started", service),
|
||||
})
|
||||
s.statusWs.Publish("status/"+service, gin.H{
|
||||
"state": "Started",
|
||||
})
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
c.JSON(http.StatusBadRequest, models.NewJsonErrorMessageResponse(fmt.Sprintf("no service '%s' found", service)))
|
||||
s.statusWs.Publish("status/"+service, gin.H{
|
||||
"state": "Error",
|
||||
"message": fmt.Sprintf("no service '%s' found", service),
|
||||
})
|
||||
}
|
||||
|
||||
func (s *ServicesHandler) StopService(c *gin.Context) {
|
||||
service := c.Param("service")
|
||||
s.statusWs.Publish("status/"+service, gin.H{
|
||||
"state": "Stopping",
|
||||
})
|
||||
|
||||
for i := range s.config.Services {
|
||||
if s.config.Services[i].Name == service {
|
||||
if err := s.config.Services[i].Stop(); err != nil {
|
||||
c.JSON(http.StatusBadGateway, gin.H{
|
||||
"error": true,
|
||||
"message": fmt.Sprintf("service '%s' error; %v", service, err),
|
||||
})
|
||||
|
||||
s.statusWs.Publish("status/"+service, gin.H{
|
||||
"state": "Error",
|
||||
"message": fmt.Sprintf("service '%s' error; %v", service, err),
|
||||
})
|
||||
return
|
||||
}
|
||||
c.JSON(http.StatusOK, gin.H{
|
||||
"message": fmt.Sprintf("service '%s' stopped", service),
|
||||
})
|
||||
|
||||
s.statusWs.Publish("status/"+service, gin.H{
|
||||
"state": "Stopped",
|
||||
})
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
c.JSON(http.StatusBadRequest, gin.H{
|
||||
"error": true,
|
||||
"message": fmt.Sprintf("no service '%s' found", service),
|
||||
})
|
||||
|
||||
s.statusWs.Publish("status/"+service, gin.H{
|
||||
"state": "Stopped",
|
||||
"message": fmt.Sprintf("no service '%s' found", service),
|
||||
})
|
||||
}
|
||||
|
||||
func (s *ServicesHandler) readDefaultConfig() (data models.Configuration, err error) {
|
||||
content, err := os.ReadFile(filepath.Join(s.cfgDir, s.cfgFile))
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = json.Unmarshal(content, &data)
|
||||
return
|
||||
}
|
@@ -33,7 +33,7 @@ func OpenBrowser(url string, logger *logging.Logger) error {
|
||||
return fmt.Errorf("os is running i headless mode do not start browser")
|
||||
}
|
||||
commands = [][]string{
|
||||
{"chromium-browser", "--kiosk", url},
|
||||
{"chromium-browser", url},
|
||||
{"google-chrome", "--kiosk", url},
|
||||
{"firefox", "--kiosk", url},
|
||||
{"xdg-open", url}, // fallback
|
||||
|
1610
package-lock.json
generated
1610
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "lightcontrol",
|
||||
"version": "0.1.2",
|
||||
"version": "0.1.4",
|
||||
"description": "A Tecamino App",
|
||||
"productName": "Light Control",
|
||||
"author": "A. Zuercher",
|
||||
@@ -15,11 +15,12 @@
|
||||
"postinstall": "quasar prepare"
|
||||
},
|
||||
"dependencies": {
|
||||
"@quasar/cli": "^2.5.0",
|
||||
"@quasar/extras": "^1.16.4",
|
||||
"axios": "^1.10.0",
|
||||
"jwt-decode": "^4.0.0",
|
||||
"pinia": "^3.0.3",
|
||||
"quasar": "^2.16.0",
|
||||
"quasar": "^2.18.2",
|
||||
"vue": "^3.4.18",
|
||||
"vue-router": "^4.0.12"
|
||||
},
|
||||
|
@@ -1,6 +1,6 @@
|
||||
<template>
|
||||
<!-- new edit scene dialog-->
|
||||
<DialogFrame ref="sceneDialog" width="350px">
|
||||
<DialogFrame ref="sceneDialog" :height="500" :width="350">
|
||||
<q-card>
|
||||
<q-card-section>
|
||||
<div class="text-primary text-h6">{{ dialogLabel }}</div>
|
||||
@@ -144,7 +144,7 @@ const scenes = ref<Scene[]>([]);
|
||||
|
||||
onMounted(() => {
|
||||
appApi
|
||||
.get('/loadScenes')
|
||||
.get('/scenes/all')
|
||||
.then((resp) => {
|
||||
if (resp.data) {
|
||||
scenes.value = resp.data;
|
||||
@@ -162,7 +162,7 @@ function removeScene(name: string) {
|
||||
if (res) {
|
||||
scenes.value = scenes.value.filter((s) => s.name !== name);
|
||||
appApi
|
||||
.delete('/deleteScene', {
|
||||
.delete('/scenes', {
|
||||
data: { name },
|
||||
})
|
||||
.then((res) => {
|
||||
@@ -203,7 +203,7 @@ function openDialog(dialogType: string, scene?: Scene, index?: number) {
|
||||
dialog.value = 'load';
|
||||
dialogLabel.value = 'Load Scene';
|
||||
appApi
|
||||
.post('/loadScene', scene)
|
||||
.post('/scenes/load', scene)
|
||||
.then((res) => {
|
||||
if (res.data) {
|
||||
Object.assign(newScene, JSON.parse(JSON.stringify(res.data)));
|
||||
@@ -278,7 +278,7 @@ const saveScene = async () => {
|
||||
scenes.value.sort((a, b) => a.name.localeCompare(b.name));
|
||||
|
||||
appApi
|
||||
.post('/saveScene', JSON.stringify(newScene))
|
||||
.post('/scenes/save', JSON.stringify(newScene))
|
||||
.then((res) => {
|
||||
if (res.data) {
|
||||
NotifyResponse(res.data);
|
||||
@@ -339,7 +339,7 @@ const saveScene = async () => {
|
||||
scenes.value = [...scenes.value];
|
||||
|
||||
appApi
|
||||
.post('/saveScene', JSON.stringify(newScene))
|
||||
.post('/scene/save', JSON.stringify(newScene))
|
||||
.then((res) => {
|
||||
if (res.data) {
|
||||
NotifyResponse(res.data);
|
||||
|
@@ -13,7 +13,7 @@ const { NotifyResponse } = useNotify();
|
||||
|
||||
function saveDBM() {
|
||||
dbmApi
|
||||
.get('saveData')
|
||||
.get('data/save')
|
||||
.then((resp) => NotifyResponse(resp.data))
|
||||
.catch((err) => NotifyResponse(catchError(err), 'error'));
|
||||
}
|
||||
|
@@ -1,15 +1,11 @@
|
||||
<template>
|
||||
<q-page>
|
||||
<q-tabs v-model="tab">
|
||||
<q-tab no-caps name="stageLights" label="Stage Lights" />
|
||||
<q-tab no-caps name="movingHead" label="Moving Head" />
|
||||
<q-tab no-caps name="lightBar" label="Light Bar" />
|
||||
<q-tab no-caps name="floodPanels" label="Flood Panels" />
|
||||
</q-tabs>
|
||||
<q-tab-panels v-model="tab" animated class="text-white">
|
||||
<q-tab-panel name="stageLights">
|
||||
<stage-lights />
|
||||
</q-tab-panel>
|
||||
<q-tab-panel name="lightBar">
|
||||
<LightBar />
|
||||
</q-tab-panel>
|
||||
@@ -27,7 +23,6 @@
|
||||
import MovingHead from 'src/components/lights/MovingHead.vue';
|
||||
import LightBar from 'src/components/lights/LightBarCBL.vue';
|
||||
import FloodPanels from 'src/components/lights/FloodPanels.vue';
|
||||
import StageLights from 'src/components/lights/StageLights.vue';
|
||||
import { ref, onMounted, watch } from 'vue';
|
||||
const tab = ref('movingHead');
|
||||
const STORAGE_KEY = 'lastTabUsed';
|
||||
|
@@ -1,60 +1,157 @@
|
||||
<template>
|
||||
<div>
|
||||
<q-card>
|
||||
<q-card-section>
|
||||
<div class="text-bold text-primary">Services</div>
|
||||
</q-card-section>
|
||||
<q-card-section>
|
||||
<q-table v-if="driverRows?.length > 0" :rows="driverRows" :columns="columns"> </q-table>
|
||||
<div v-else class="q-pa-md text-grey text-center">
|
||||
<div>No services available</div>
|
||||
<div class="row justify-center">
|
||||
<q-card-section class="col-8">
|
||||
<div class="q-py-md text-grey text-left">
|
||||
<div v-if="driverRows?.length == 0">No services available</div>
|
||||
<q-btn
|
||||
no-caps
|
||||
rounded
|
||||
color="primary"
|
||||
:class="['q-ma-md', 'text-bold', 'text-white']"
|
||||
:style="'font-size: 12px;'"
|
||||
:class="[, 'text-bold', 'text-white']"
|
||||
:disable="userStore.user?.role !== 'admin'"
|
||||
@click="addNewDriver"
|
||||
>Add First Service</q-btn
|
||||
>
|
||||
Add {{ driverRows?.length == 0 ? 'First' : '' }} Service
|
||||
</q-btn>
|
||||
</div>
|
||||
<q-table v-if="driverRows?.length > 0" :rows="driverRows" :columns="columns">
|
||||
<template v-slot:body-cell-settings="props">
|
||||
<q-td :props="props">
|
||||
<q-btn
|
||||
dense
|
||||
flat
|
||||
size="md"
|
||||
icon="more_vert"
|
||||
@click="openSubMenu($event, props.row)"
|
||||
></q-btn>
|
||||
</q-td>
|
||||
</template>
|
||||
<template v-slot:body-cell-state="props">
|
||||
<q-td :props="props">
|
||||
<q-badge
|
||||
:color="props.row.stateColor"
|
||||
:text-color="props.row.stateTextColor"
|
||||
:label="props.row.state"
|
||||
/>
|
||||
</q-td>
|
||||
</template>
|
||||
</q-table>
|
||||
</q-card-section>
|
||||
</div>
|
||||
<sub-menu ref="subMenuRef" />
|
||||
</q-card>
|
||||
|
||||
<service-dialog ref="refServiceDialog"></service-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { reactive, ref } from 'vue';
|
||||
import type { QTableProps } from 'quasar';
|
||||
import { onMounted, reactive, ref, toRef } from 'vue';
|
||||
import { useQuasar, type QTableProps } from 'quasar';
|
||||
import { useUserStore } from 'src/vueLib/login/userStore';
|
||||
import ServiceDialog from 'src/vueLib/services/dialog/ServiceDialog.vue';
|
||||
import { useNotify } from 'src/vueLib/general/useNotify';
|
||||
import type { Service, Services, State } from 'src/vueLib/models/Services';
|
||||
import { useServices } from 'src/vueLib/models/Services';
|
||||
import SubMenu from 'src/vueLib/services/dialog/SubMenu.vue';
|
||||
import { useStatusServer } from 'src/vueLib/services/statusServer/useStatusServer';
|
||||
|
||||
const { NotifyResponse } = useNotify();
|
||||
|
||||
const userStore = useUserStore();
|
||||
const refServiceDialog = ref();
|
||||
const driverRows = reactive([]);
|
||||
const { initServices } = useServices();
|
||||
const driverRows = reactive<Services>([]);
|
||||
const { connect, subscribe } = useStatusServer(
|
||||
'127.0.0.1',
|
||||
9500,
|
||||
'api/status',
|
||||
'quasar',
|
||||
(response) => {
|
||||
// normalize topic to service name
|
||||
const serviceName = response.topic.replace('status/', '').replace(' ', '');
|
||||
const driver = driverRows.find((d) => d.name.replace(' ', '') === serviceName);
|
||||
|
||||
if (driver && response.data?.state !== undefined) {
|
||||
// update state reactively
|
||||
driver.state = response.data?.state as State;
|
||||
|
||||
// update colors depending on state
|
||||
switch (driver.state) {
|
||||
case 'Running':
|
||||
driver.stateColor = 'green';
|
||||
driver.stateTextColor = 'white';
|
||||
break;
|
||||
case 'Starting':
|
||||
driver.stateColor = 'orange';
|
||||
driver.stateTextColor = 'black';
|
||||
break;
|
||||
case 'Stopping':
|
||||
driver.stateColor = 'orange';
|
||||
driver.stateTextColor = 'black';
|
||||
break;
|
||||
case 'Error':
|
||||
driver.stateColor = 'red';
|
||||
driver.stateTextColor = 'white';
|
||||
NotifyResponse(response.data?.message, 'error');
|
||||
break;
|
||||
case 'Stopped':
|
||||
default:
|
||||
driver.stateColor = 'grey-4';
|
||||
driver.stateTextColor = 'black';
|
||||
break;
|
||||
}
|
||||
}
|
||||
},
|
||||
useQuasar(),
|
||||
);
|
||||
|
||||
const subMenuRef = ref();
|
||||
|
||||
const columns = [
|
||||
{ name: 'path', label: 'Path', field: 'path', align: 'left' },
|
||||
{ name: 'name', label: 'Name', field: 'name', align: 'left', style: 'font-size:12px;' },
|
||||
{
|
||||
name: 'type',
|
||||
label: 'Type',
|
||||
field: 'type',
|
||||
align: 'left',
|
||||
name: 'description',
|
||||
label: 'Description',
|
||||
field: 'description',
|
||||
align: 'center',
|
||||
style: 'font-size:12px;',
|
||||
},
|
||||
{
|
||||
name: 'value',
|
||||
label: 'Value',
|
||||
field: 'value',
|
||||
align: 'left',
|
||||
},
|
||||
{
|
||||
name: 'drivers',
|
||||
label: 'Drivers',
|
||||
field: 'drivers',
|
||||
name: 'settings',
|
||||
label: '',
|
||||
field: 'settings',
|
||||
align: 'center',
|
||||
},
|
||||
{
|
||||
name: 'state',
|
||||
label: 'State',
|
||||
field: 'state',
|
||||
align: 'left',
|
||||
},
|
||||
] as QTableProps['columns'];
|
||||
|
||||
onMounted(() => {
|
||||
initServices()
|
||||
.then((resp) => {
|
||||
driverRows.push(...resp);
|
||||
})
|
||||
.catch((err) => NotifyResponse(err, 'error'));
|
||||
connect();
|
||||
subscribe('*').catch((err) => NotifyResponse(err, 'error'));
|
||||
});
|
||||
|
||||
function addNewDriver() {
|
||||
refServiceDialog.value.open();
|
||||
}
|
||||
|
||||
function openSubMenu(event: Event, service: Service) {
|
||||
subMenuRef.value?.open(event, toRef(driverRows.find((d) => d.name === service.name)!));
|
||||
}
|
||||
</script>
|
||||
|
@@ -62,14 +62,14 @@
|
||||
</q-table>
|
||||
<RenameDialog
|
||||
dialogLabel="Rename Datapoint"
|
||||
width="400px"
|
||||
:width="400"
|
||||
button-ok-label="Rename"
|
||||
ref="renameDialog"
|
||||
/>
|
||||
<UpdateDialog width="400px" button-ok-label="Write" ref="updateDialog" />
|
||||
<UpdateDriver width="400px" ref="updateDriverDialog" />
|
||||
<UpdateDialog :width="400" button-ok-label="Write" ref="updateDialog" />
|
||||
<UpdateDriver :width="400" ref="updateDriverDialog" />
|
||||
<UpdateDatatype
|
||||
width="400px"
|
||||
:width="400"
|
||||
button-ok-label="Update"
|
||||
ref="updateDatatype"
|
||||
dialog-label="Update Datatype"
|
||||
|
@@ -101,13 +101,13 @@
|
||||
</q-item>
|
||||
</q-list>
|
||||
</q-menu>
|
||||
<RenameDatapoint :dialogLabel="label" width="700px" button-ok-label="Rename" ref="renameDialog" />
|
||||
<AddDialog :dialogLabel="label" width="750px" button-ok-label="Add" ref="addDialog" />
|
||||
<RemoveDialog :dialogLabel="label" width="350px" button-ok-label="Remove" ref="removeDialog" />
|
||||
<CopyDialog :dialogLabel="label" width="300px" button-ok-label="Copy" ref="copyDialog" />
|
||||
<RenameDatapoint :dialogLabel="label" :width="700" button-ok-label="Rename" ref="renameDialog" />
|
||||
<AddDialog :dialogLabel="label" :width="750" button-ok-label="Add" ref="addDialog" />
|
||||
<RemoveDialog :dialogLabel="label" :width="350" button-ok-label="Remove" ref="removeDialog" />
|
||||
<CopyDialog :dialogLabel="label" :width="300" button-ok-label="Copy" ref="copyDialog" />
|
||||
<UpdateDatapoint
|
||||
:dialogLabel="label"
|
||||
width="300px"
|
||||
:width="300"
|
||||
button-ok-label="Update"
|
||||
ref="datatypeDialog"
|
||||
/>
|
||||
|
@@ -136,12 +136,12 @@ const props = defineProps({
|
||||
default: '',
|
||||
},
|
||||
width: {
|
||||
type: String,
|
||||
default: '300px',
|
||||
type: Number,
|
||||
default: 300,
|
||||
},
|
||||
height: {
|
||||
type: String,
|
||||
default: '650px',
|
||||
type: Number,
|
||||
default: 650,
|
||||
},
|
||||
});
|
||||
|
||||
|
@@ -121,12 +121,12 @@ const props = defineProps({
|
||||
default: '',
|
||||
},
|
||||
width: {
|
||||
type: String,
|
||||
default: '300px',
|
||||
type: Number,
|
||||
default: 300,
|
||||
},
|
||||
height: {
|
||||
type: String,
|
||||
default: '400px',
|
||||
type: Number,
|
||||
default: 400,
|
||||
},
|
||||
});
|
||||
|
||||
|
@@ -130,12 +130,12 @@ const props = defineProps({
|
||||
default: '',
|
||||
},
|
||||
width: {
|
||||
type: String,
|
||||
default: '300px',
|
||||
type: Number,
|
||||
default: 300,
|
||||
},
|
||||
height: {
|
||||
type: String,
|
||||
default: '480px',
|
||||
type: Number,
|
||||
default: 480,
|
||||
},
|
||||
});
|
||||
|
||||
|
@@ -86,8 +86,8 @@ const props = defineProps({
|
||||
default: '',
|
||||
},
|
||||
width: {
|
||||
type: String,
|
||||
default: '300px',
|
||||
type: Number,
|
||||
default: 300,
|
||||
},
|
||||
});
|
||||
|
||||
|
@@ -128,12 +128,12 @@ const props = defineProps({
|
||||
default: '',
|
||||
},
|
||||
width: {
|
||||
type: String,
|
||||
default: '300px',
|
||||
type: Number,
|
||||
default: 300,
|
||||
},
|
||||
height: {
|
||||
type: String,
|
||||
default: '400px',
|
||||
type: Number,
|
||||
default: 400,
|
||||
},
|
||||
});
|
||||
|
||||
|
@@ -119,12 +119,12 @@ const props = defineProps({
|
||||
default: '',
|
||||
},
|
||||
width: {
|
||||
type: String,
|
||||
default: '300px',
|
||||
type: Number,
|
||||
default: 300,
|
||||
},
|
||||
height: {
|
||||
type: String,
|
||||
default: '340px',
|
||||
type: Number,
|
||||
default: 340,
|
||||
},
|
||||
});
|
||||
|
||||
|
@@ -126,12 +126,12 @@ const props = defineProps({
|
||||
default: '',
|
||||
},
|
||||
width: {
|
||||
type: String,
|
||||
default: '300px',
|
||||
type: Number,
|
||||
default: 300,
|
||||
},
|
||||
height: {
|
||||
type: String,
|
||||
default: '500px',
|
||||
type: Number,
|
||||
default: 500,
|
||||
},
|
||||
});
|
||||
|
||||
|
@@ -106,12 +106,12 @@ const props = defineProps({
|
||||
default: '',
|
||||
},
|
||||
width: {
|
||||
type: String,
|
||||
default: '300px',
|
||||
type: Number,
|
||||
default: 300,
|
||||
},
|
||||
height: {
|
||||
type: String,
|
||||
default: '350px',
|
||||
type: Number,
|
||||
default: 350,
|
||||
},
|
||||
});
|
||||
|
||||
|
@@ -13,7 +13,7 @@
|
||||
class="dialog-header row items-center justify-between bg-grey-1"
|
||||
v-touch-pan.mouse.prevent.stop="handlePan"
|
||||
>
|
||||
<div v-if="headerTitle" class="text-left text-bold text-caption q-mx-sm">
|
||||
<div class="text-left text-bold text-caption q-mx-sm">
|
||||
{{ headerTitle }}
|
||||
</div>
|
||||
<div class="row justify-end q-mx-sm">
|
||||
@@ -45,8 +45,8 @@ defineExpose({ open, close });
|
||||
|
||||
const props = defineProps({
|
||||
headerTitle: { type: String, default: '' },
|
||||
width: { type: String, default: '400' },
|
||||
height: { type: String, default: '250' },
|
||||
width: { type: Number, default: 400 },
|
||||
height: { type: Number, default: 250 },
|
||||
});
|
||||
|
||||
// Fullscreen toggle
|
||||
@@ -59,8 +59,8 @@ function minMax() {
|
||||
|
||||
// Position and Size
|
||||
const position = ref({ x: 0, y: 0 });
|
||||
const width = ref(parseInt(props.width));
|
||||
const height = ref(parseInt(props.height));
|
||||
const width = ref(props.width);
|
||||
const height = ref(props.height);
|
||||
|
||||
// Dragging (only from header)
|
||||
const handlePan = (details: { delta: { x: number; y: number } }) => {
|
||||
|
@@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<DialogFrame ref="Dialog" width="300px" height="380px" header-title="Login">
|
||||
<DialogFrame ref="Dialog" :width="300" :height="380" header-title="Login">
|
||||
<div class="text-black"></div>
|
||||
<q-form ref="refForm">
|
||||
<q-item-section class="q-gutter-md q-pa-md">
|
||||
|
64
src/vueLib/models/Services.ts
Normal file
64
src/vueLib/models/Services.ts
Normal file
@@ -0,0 +1,64 @@
|
||||
import { appApi } from 'src/boot/axios';
|
||||
//import { ref } from 'vue';
|
||||
|
||||
export interface Service {
|
||||
name: string;
|
||||
workingDirectory: string;
|
||||
executablePath: string;
|
||||
description: string;
|
||||
arguments: string[];
|
||||
state: State;
|
||||
stateColor: string;
|
||||
stateTextColor: string;
|
||||
}
|
||||
export type Services = Service[];
|
||||
export type State = 'Stopped' | 'Stopping' | 'Starting' | 'Running' | 'Error';
|
||||
|
||||
export function useServices() {
|
||||
async function initServices() {
|
||||
return appApi
|
||||
.get('services/load')
|
||||
.then((resp) => {
|
||||
const normalized = resp.data.services.map((item: Service) => {
|
||||
if (!item.state) {
|
||||
item.state = 'Stopped';
|
||||
}
|
||||
|
||||
let stateColor = 'grey-4';
|
||||
let stateTextColor = 'black';
|
||||
|
||||
switch (item.state) {
|
||||
case 'Running':
|
||||
stateColor = 'green';
|
||||
stateTextColor = 'white';
|
||||
break;
|
||||
case 'Starting':
|
||||
case 'Stopping':
|
||||
stateColor = 'green';
|
||||
stateTextColor = 'white';
|
||||
break;
|
||||
case 'Stopped':
|
||||
default:
|
||||
stateColor = 'grey-4';
|
||||
stateTextColor = 'black';
|
||||
break;
|
||||
}
|
||||
|
||||
return {
|
||||
...item,
|
||||
stateColor,
|
||||
stateTextColor,
|
||||
};
|
||||
});
|
||||
|
||||
return normalized;
|
||||
})
|
||||
.catch((err) => {
|
||||
throw err;
|
||||
});
|
||||
}
|
||||
|
||||
return {
|
||||
initServices,
|
||||
};
|
||||
}
|
@@ -1,9 +1,14 @@
|
||||
<template>
|
||||
<DialogFrame ref="refDialog" width="500px" header-title="Add new Service">
|
||||
<DialogFrame ref="refDialog" :width="250" header-title="Add new Service">
|
||||
<div class="row justify-center">
|
||||
<q-select class="col-4" :options="opts" v-model="option"></q-select>
|
||||
<div>
|
||||
<div class="q-ma-md text-primary text-bold">Choose new service</div>
|
||||
<q-select dense filled class="col-4" :options="opts" v-model="option"></q-select>
|
||||
<div class="row justify-end">
|
||||
<q-btn class="q-mt-md" no-caps color="primary">Add Service</q-btn>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <q-table :rows="driverRows"> </q-table> -->
|
||||
</DialogFrame>
|
||||
</template>
|
||||
|
||||
@@ -18,17 +23,17 @@ const { NotifyResponse } = useNotify();
|
||||
const refDialog = ref();
|
||||
const driverRows = ref([]);
|
||||
const opts = ref();
|
||||
const option = ref('Choose new service');
|
||||
const option = ref('');
|
||||
|
||||
interface conf {
|
||||
name: string;
|
||||
}
|
||||
function open() {
|
||||
appApi
|
||||
.get('/allDrivers')
|
||||
.get('services/all')
|
||||
.then((resp) => {
|
||||
driverRows.value = resp.data;
|
||||
opts.value = resp.data.map((item: conf) => item.name);
|
||||
opts.value = resp.data.services.map((item: conf) => item.name);
|
||||
})
|
||||
.catch((err) => NotifyResponse(err, 'error'));
|
||||
refDialog.value.open();
|
||||
|
92
src/vueLib/services/dialog/SubMenu.vue
Normal file
92
src/vueLib/services/dialog/SubMenu.vue
Normal file
@@ -0,0 +1,92 @@
|
||||
<template>
|
||||
<q-menu ref="refMenu" context-menu>
|
||||
<q-list>
|
||||
<q-item :disable="!startEnabled" clickable @click="start">
|
||||
<q-item-section>
|
||||
<q-icon :color="startEnabled ? 'green' : 'green-2'" name="play_arrow" size="sm" />
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
<q-item :disable="!stopEnabled" clickable @click="stop">
|
||||
<q-item-section>
|
||||
<q-icon :color="stopEnabled ? 'red' : 'red-2'" name="stop" size="sm" />
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
<q-item :disable="!restartEnabled" clickable>
|
||||
<q-item-section>
|
||||
<q-icon
|
||||
:color="restartEnabled ? 'orange' : 'orange-3'"
|
||||
name="restart_alt"
|
||||
size="sm"
|
||||
@click="console.log('restart')"
|
||||
/>
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
</q-list>
|
||||
</q-menu>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { appApi } from 'src/boot/axios';
|
||||
import type { Service } from 'src/vueLib/models/Services';
|
||||
import { computed, ref } from 'vue';
|
||||
import { useNotify } from 'src/vueLib/general/useNotify';
|
||||
|
||||
const { NotifyResponse } = useNotify();
|
||||
|
||||
const refMenu = ref();
|
||||
const startEnabled = computed(() => localService.value?.state === 'Stopped' || 'Error');
|
||||
const stopEnabled = computed(() => localService.value?.state === 'Running');
|
||||
const restartEnabled = computed(() => localService.value?.state === 'Running');
|
||||
const localService = ref<Service>();
|
||||
|
||||
const open = (event: MouseEvent, service: Service) => {
|
||||
localService.value = service;
|
||||
refMenu.value?.show(event);
|
||||
};
|
||||
|
||||
function start() {
|
||||
if (!localService.value) {
|
||||
return;
|
||||
}
|
||||
localService.value.state = 'Starting';
|
||||
localService.value.stateColor = 'yellow';
|
||||
localService.value.stateTextColor = 'black';
|
||||
appApi
|
||||
.get(`/services/${localService.value.name}/start`)
|
||||
.then(() => {
|
||||
if (!localService.value) {
|
||||
return;
|
||||
}
|
||||
localService.value.state = 'Running';
|
||||
localService.value.stateColor = 'green';
|
||||
localService.value.stateTextColor = 'white';
|
||||
})
|
||||
.catch((err) => {
|
||||
console.error(err);
|
||||
NotifyResponse(err, 'error');
|
||||
});
|
||||
}
|
||||
|
||||
function stop() {
|
||||
if (!localService.value) {
|
||||
return;
|
||||
}
|
||||
localService.value.state = 'Stopping';
|
||||
localService.value.stateColor = 'yellow';
|
||||
localService.value.stateTextColor = 'black';
|
||||
|
||||
appApi
|
||||
.get(`/services/${localService.value.name}/stop`)
|
||||
.then(() => {
|
||||
if (!localService.value) {
|
||||
return;
|
||||
}
|
||||
localService.value.state = 'Stopped';
|
||||
localService.value.stateColor = 'grey-4';
|
||||
localService.value.stateTextColor = 'black';
|
||||
})
|
||||
.catch((err) => NotifyResponse(err, 'error'));
|
||||
}
|
||||
|
||||
defineExpose({ open });
|
||||
</script>
|
7
src/vueLib/services/statusServer/models.ts
Normal file
7
src/vueLib/services/statusServer/models.ts
Normal file
@@ -0,0 +1,7 @@
|
||||
export type Payload = {
|
||||
action?: Action;
|
||||
topic: string;
|
||||
data: { state?: string; message?: string };
|
||||
};
|
||||
|
||||
export type Action = 'subscribe' | 'publish';
|
115
src/vueLib/services/statusServer/useStatusServer.ts
Normal file
115
src/vueLib/services/statusServer/useStatusServer.ts
Normal file
@@ -0,0 +1,115 @@
|
||||
import type { Response } from '../../models/Response';
|
||||
import type { QVueGlobals } from 'quasar';
|
||||
import { ref } from 'vue';
|
||||
import type { Payload } from './models';
|
||||
|
||||
let socket: WebSocket | null = null;
|
||||
|
||||
const isConnected = ref(false);
|
||||
|
||||
export function useStatusServer(
|
||||
host: string,
|
||||
port: number = 9500,
|
||||
path: string,
|
||||
id: string,
|
||||
callback: (payload: Payload) => void,
|
||||
$q?: QVueGlobals,
|
||||
) {
|
||||
const connect = () => {
|
||||
socket = new WebSocket(`ws://${host}:${port}/${path}?id=${id}`);
|
||||
|
||||
socket.onopen = () => {
|
||||
console.log('WebSocket connected');
|
||||
isConnected.value = true;
|
||||
};
|
||||
|
||||
socket.onclose = () => {
|
||||
isConnected.value = false;
|
||||
console.log('WebSocket disconnected');
|
||||
$q?.notify({
|
||||
message: 'WebSocket disconnected',
|
||||
color: 'orange',
|
||||
position: 'bottom-right',
|
||||
icon: 'warning',
|
||||
timeout: 10000,
|
||||
});
|
||||
};
|
||||
socket.onerror = (err) => {
|
||||
console.log(`WebSocket error: ${err.type}`);
|
||||
isConnected.value = false;
|
||||
$q?.notify({
|
||||
message: `WebSocket error: ${err.type}`,
|
||||
color: 'red',
|
||||
position: 'bottom-right',
|
||||
icon: 'error',
|
||||
timeout: 10000,
|
||||
});
|
||||
};
|
||||
socket.onmessage = (event) => {
|
||||
callback(JSON.parse(event.data));
|
||||
};
|
||||
};
|
||||
|
||||
function subscribe(topic: string): Promise<Response | undefined> {
|
||||
return new Promise((resolve) => {
|
||||
waitForSocketConnection()
|
||||
.then(() => {
|
||||
socket?.send('{"action":"subscribe", "topic":"' + topic + '"}');
|
||||
})
|
||||
.catch((err) => {
|
||||
console.warn('WebSocket send failed:', err);
|
||||
resolve(undefined); // or reject(err) if strict failure is desired
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function publish(topic: string, data: unknown): Promise<Response | undefined> {
|
||||
return new Promise((resolve) => {
|
||||
waitForSocketConnection()
|
||||
.then(() => {
|
||||
socket?.send(
|
||||
'{"action":"publish", "topic":"' + topic + '", "data":' + JSON.stringify(data) + '}',
|
||||
);
|
||||
})
|
||||
.catch((err) => {
|
||||
console.warn('WebSocket send failed:', err);
|
||||
resolve(undefined); // or reject(err) if strict failure is desired
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
const close = () => {
|
||||
if (socket) {
|
||||
socket.close();
|
||||
}
|
||||
};
|
||||
|
||||
return {
|
||||
connect,
|
||||
close,
|
||||
subscribe,
|
||||
publish,
|
||||
};
|
||||
}
|
||||
|
||||
function waitForSocketConnection(): Promise<void> {
|
||||
return new Promise((resolve, reject) => {
|
||||
const maxWait = 5000; // timeout after 5 seconds
|
||||
const interval = 50;
|
||||
let waited = 0;
|
||||
|
||||
const check = () => {
|
||||
if (socket && socket.readyState === WebSocket.OPEN) {
|
||||
resolve();
|
||||
} else {
|
||||
waited += interval;
|
||||
if (waited >= maxWait) {
|
||||
reject(new Error('WebSocket connection timeout'));
|
||||
} else {
|
||||
setTimeout(check, interval);
|
||||
}
|
||||
}
|
||||
};
|
||||
check();
|
||||
});
|
||||
}
|
Reference in New Issue
Block a user