diff --git a/.goreleaser.yaml b/backend/.goreleaser.yaml similarity index 100% rename from .goreleaser.yaml rename to backend/.goreleaser.yaml diff --git a/backend/LICENSE b/backend/LICENSE new file mode 100644 index 0000000..aaaff2c --- /dev/null +++ b/backend/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2022 aceberg + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/Makefile b/backend/Makefile similarity index 60% rename from Makefile rename to backend/Makefile index e6b3f11..5ac458f 100644 --- a/Makefile +++ b/backend/Makefile @@ -7,13 +7,16 @@ mod: run: cd cmd/WatchYourLAN/ && \ sudo \ - go run . #-c /data/config #-n http://192.168.2.3:8850 + go run . #-n http://192.168.2.3:8850 fmt: go fmt ./... lint: -# golangci-lint run + golangci-lint run golint ./... -check: fmt lint \ No newline at end of file +check: fmt lint + +swag: + swag init --parseInternal --dir cmd/WatchYourLAN \ No newline at end of file diff --git a/cmd/WatchYourLAN/main.go b/backend/cmd/WatchYourLAN/main.go similarity index 100% rename from cmd/WatchYourLAN/main.go rename to backend/cmd/WatchYourLAN/main.go diff --git a/configs/install.sh b/backend/configs/install.sh similarity index 100% rename from configs/install.sh rename to backend/configs/install.sh diff --git a/configs/postinstall.sh b/backend/configs/postinstall.sh similarity index 100% rename from configs/postinstall.sh rename to backend/configs/postinstall.sh diff --git a/configs/watchyourlan b/backend/configs/watchyourlan similarity index 100% rename from configs/watchyourlan rename to backend/configs/watchyourlan diff --git a/configs/watchyourlan.service b/backend/configs/watchyourlan.service similarity index 100% rename from configs/watchyourlan.service rename to backend/configs/watchyourlan.service diff --git a/go.mod b/backend/go.mod similarity index 100% rename from go.mod rename to backend/go.mod diff --git a/go.sum b/backend/go.sum similarity index 100% rename from go.sum rename to backend/go.sum diff --git a/internal/api/api.go b/backend/internal/api/api.go similarity index 100% rename from internal/api/api.go rename to backend/internal/api/api.go diff --git a/internal/api/config.go b/backend/internal/api/config.go similarity index 100% rename from internal/api/config.go rename to backend/internal/api/config.go diff --git a/internal/api/functions.go b/backend/internal/api/functions.go similarity index 100% rename from internal/api/functions.go rename to backend/internal/api/functions.go diff --git a/internal/api/routes.go b/backend/internal/api/routes.go similarity index 100% rename from internal/api/routes.go rename to backend/internal/api/routes.go diff --git a/internal/arp/arpscan.go b/backend/internal/arp/arpscan.go similarity index 100% rename from internal/arp/arpscan.go rename to backend/internal/arp/arpscan.go diff --git a/internal/check/error.go b/backend/internal/check/error.go similarity index 100% rename from internal/check/error.go rename to backend/internal/check/error.go diff --git a/internal/check/file.go b/backend/internal/check/file.go similarity index 100% rename from internal/check/file.go rename to backend/internal/check/file.go diff --git a/internal/check/network.go b/backend/internal/check/network.go similarity index 100% rename from internal/check/network.go rename to backend/internal/check/network.go diff --git a/internal/conf/read.go b/backend/internal/conf/read.go similarity index 100% rename from internal/conf/read.go rename to backend/internal/conf/read.go diff --git a/internal/conf/start.go b/backend/internal/conf/start.go similarity index 100% rename from internal/conf/start.go rename to backend/internal/conf/start.go diff --git a/internal/conf/write.go b/backend/internal/conf/write.go similarity index 100% rename from internal/conf/write.go rename to backend/internal/conf/write.go diff --git a/internal/gdb/edit.go b/backend/internal/gdb/edit.go similarity index 100% rename from internal/gdb/edit.go rename to backend/internal/gdb/edit.go diff --git a/internal/gdb/select.go b/backend/internal/gdb/select.go similarity index 100% rename from internal/gdb/select.go rename to backend/internal/gdb/select.go diff --git a/internal/gdb/start.go b/backend/internal/gdb/start.go similarity index 100% rename from internal/gdb/start.go rename to backend/internal/gdb/start.go diff --git a/internal/influx/influx.go b/backend/internal/influx/influx.go similarity index 100% rename from internal/influx/influx.go rename to backend/internal/influx/influx.go diff --git a/internal/models/models.go b/backend/internal/models/models.go similarity index 100% rename from internal/models/models.go rename to backend/internal/models/models.go diff --git a/internal/notify/shout.go b/backend/internal/notify/shout.go similarity index 100% rename from internal/notify/shout.go rename to backend/internal/notify/shout.go diff --git a/internal/portscan/scan.go b/backend/internal/portscan/scan.go similarity index 76% rename from internal/portscan/scan.go rename to backend/internal/portscan/scan.go index 9b6889c..00342ce 100644 --- a/internal/portscan/scan.go +++ b/backend/internal/portscan/scan.go @@ -13,13 +13,12 @@ func IsOpen(host, port string) bool { target := fmt.Sprintf("%s:%s", host, port) conn, err := net.DialTimeout("tcp", target, timeout) - if err != nil { - return false - } - if conn != nil { - conn.Close() - return true + if err == nil { + err = conn.Close() + if err == nil { + return true + } } return false diff --git a/internal/prometheus/prometheus.go b/backend/internal/prometheus/prometheus.go similarity index 100% rename from internal/prometheus/prometheus.go rename to backend/internal/prometheus/prometheus.go diff --git a/internal/routines/restart-scan.go b/backend/internal/routines/restart-scan.go similarity index 100% rename from internal/routines/restart-scan.go rename to backend/internal/routines/restart-scan.go diff --git a/internal/routines/scan-routine.go b/backend/internal/routines/scan-routine.go similarity index 100% rename from internal/routines/scan-routine.go rename to backend/internal/routines/scan-routine.go diff --git a/internal/routines/trim-history.go b/backend/internal/routines/trim-history.go similarity index 100% rename from internal/routines/trim-history.go rename to backend/internal/routines/trim-history.go diff --git a/internal/web/index.go b/backend/internal/web/index.go similarity index 100% rename from internal/web/index.go rename to backend/internal/web/index.go diff --git a/internal/web/public/assets/Config.js b/backend/internal/web/public/assets/Config.js similarity index 100% rename from internal/web/public/assets/Config.js rename to backend/internal/web/public/assets/Config.js diff --git a/internal/web/public/assets/History.js b/backend/internal/web/public/assets/History.js similarity index 100% rename from internal/web/public/assets/History.js rename to backend/internal/web/public/assets/History.js diff --git a/internal/web/public/assets/HostPage.js b/backend/internal/web/public/assets/HostPage.js similarity index 100% rename from internal/web/public/assets/HostPage.js rename to backend/internal/web/public/assets/HostPage.js diff --git a/internal/web/public/assets/MacHistory.js b/backend/internal/web/public/assets/MacHistory.js similarity index 100% rename from internal/web/public/assets/MacHistory.js rename to backend/internal/web/public/assets/MacHistory.js diff --git a/internal/web/public/assets/index.css b/backend/internal/web/public/assets/index.css similarity index 100% rename from internal/web/public/assets/index.css rename to backend/internal/web/public/assets/index.css diff --git a/internal/web/public/assets/index.js b/backend/internal/web/public/assets/index.js similarity index 100% rename from internal/web/public/assets/index.js rename to backend/internal/web/public/assets/index.js diff --git a/internal/web/public/favicon.png b/backend/internal/web/public/favicon.png similarity index 100% rename from internal/web/public/favicon.png rename to backend/internal/web/public/favicon.png diff --git a/internal/web/public/version b/backend/internal/web/public/version similarity index 100% rename from internal/web/public/version rename to backend/internal/web/public/version diff --git a/internal/web/templates/index.html b/backend/internal/web/templates/index.html similarity index 100% rename from internal/web/templates/index.html rename to backend/internal/web/templates/index.html diff --git a/internal/web/webgui.go b/backend/internal/web/webgui.go similarity index 100% rename from internal/web/webgui.go rename to backend/internal/web/webgui.go diff --git a/frontend/Makefile b/frontend/Makefile index 6016877..ff1ba23 100644 --- a/frontend/Makefile +++ b/frontend/Makefile @@ -3,11 +3,11 @@ USR_NAME=aceberg build: npm run build && \ - rm ../internal/web/public/assets/* && \ - cp -r dist/assets ../internal/web/public + rm ../backend/internal/web/public/assets/* && \ + cp -r dist/assets ../backend/internal/web/public replace: - cd ../internal/web/public/assets/ && \ + cd ../backend/internal/web/public/assets/ && \ cat index.js | sed 's/assets/fs\/public\/assets/g;s/http:\/\/0.0.0.0:8840//' > tmp && \ mv tmp index.js