4 Commits
Author SHA1 Message Date
paul 72734c7faa Release 0.0.8
Build image / build-image (push) Successful in 3m2s
2025-04-25 18:27:42 +02:00
paul 5deb037fe5 Apply go fmt 2025-04-25 18:27:23 +02:00
paul 6e78235127 Add VRNP_CLIENT_ALLOWLIST env var 2025-04-25 18:26:20 +02:00
paul 5d5b893948 Sort departures by countdown
Build image / build-image (push) Successful in 2m45s
2025-04-25 17:09:29 +02:00
2 changed files with 24 additions and 7 deletions
+1 -1
View File
@@ -16,7 +16,7 @@
vrnp-static = pkgs.buildGoModule {
pname = "vrnp";
version = "0.0.6";
version = "0.0.8";
vendorHash = null;
# For building the package, we use only the files not ignored by Git as inputs.
+22 -5
View File
@@ -1,5 +1,6 @@
package main
import "cmp"
import "encoding/json"
import "errors"
import "fmt"
@@ -50,6 +51,12 @@ type EFAClient interface {
BuildRequest(string) (*http.Request, error)
}
var allEfaClients []EFAClient = []EFAClient{
BwegtEFAClient{},
VRNEFAClient{},
KVVEFAClient{},
}
type VRNEFAClient struct {
}
@@ -97,6 +104,7 @@ func (c KVVEFAClient) BuildRequest(stopId string) (*http.Request, error) {
form.Set("useRealtime", "1")
form.Set("limit", "10")
form.Set("mode", "direct")
form.Set("useRealtime", "1")
form.Set("outputFormat", "json")
body := strings.NewReader(form.Encode())
@@ -179,6 +187,7 @@ type Departure struct {
Symbol string `json:"symbol"`
Direction string `json:"direction"`
Leaving string `json:"leaving"`
Countdown int `json:"-"`
}
func ParseDepartures(response DMResponse, allowedPlatform *string) (Departures, error) {
@@ -223,24 +232,32 @@ func ParseDepartures(response DMResponse, allowedPlatform *string) (Departures,
d.ServingLine.Symbol,
direction,
leaving,
countdown,
})
}
slices.SortFunc(ds, func(a Departure, b Departure) int {
return cmp.Compare(a.Countdown, b.Countdown)
})
return Departures{ds}, nil
}
func main() {
password := os.Getenv("VRNP_PASSWORD")
if len(password) == 0 {
panic("Required environment variable VRNP_PASSWORD is not set")
log.Fatal("Required environment variable VRNP_PASSWORD is not set")
}
clientAllowlist := strings.Split(os.Getenv("VRNP_CLIENT_ALLOWLIST"), ",")
// Use round-robin to send incoming requests to different servers
var efaClient atomic.Uint64
efaClients := []EFAClient{
BwegtEFAClient{},
VRNEFAClient{},
KVVEFAClient{},
var efaClients []EFAClient
for _, efaClient := range allEfaClients {
if len(clientAllowlist) != 0 && slices.Contains(clientAllowlist, efaClient.GetName()) {
efaClients = append(efaClients, efaClient)
}
}
http.HandleFunc("/departures", func(w http.ResponseWriter, r *http.Request) {