mirror of
https://github.com/renorris/openfsd
synced 2026-05-02 14:45:38 +08:00
v0.1.0-alpha
Changes:
- Implement bootstrapping library for managing several concurrent internal services
- Refactor concurrency model for connections/logical clients and their associated I/O
- Refactor server context singleton
- Refactor error handling
- Most errors are now gracefully sent to the FSD client directly encoded as an $ER packet,
enhancing visibility and debugging
- Most errors are now rightfully treated as non-fatal
- Refactor package/dependency graph
- Refactor calling conventions/interfaces for many packages
- Refactor database package
- Refactor post office
Features:
- Add VATSIM-esque HTTP/JSON "data feed"
- Add ephemeral in-memory database option
- Add user management REST API
- Add improved web interface
- Add MySQL support (drop SQLite support)
This commit is contained in:
@@ -9,7 +9,7 @@ import (
|
||||
type PilotPositionPDU struct {
|
||||
SquawkingModeC bool `validate:""`
|
||||
Identing bool `validate:""`
|
||||
From string `validate:"required,alphanum,max=7"`
|
||||
From string `validate:"required,alphanum,max=16"`
|
||||
SquawkCode string `validate:"len=4"`
|
||||
NetworkRating int `validate:"required,min=1,max=12"`
|
||||
Lat float64 `validate:"min=-90.0,max=90.0"`
|
||||
@@ -76,94 +76,87 @@ func (p *PilotPositionPDU) Serialize() string {
|
||||
xpdrStateStr = "N"
|
||||
}
|
||||
|
||||
return fmt.Sprintf("@%s:%s:%s:%d:%.6f:%.6f:%d:%d:%d:%d%s", xpdrStateStr, p.From, p.SquawkCode, p.NetworkRating, p.Lat, p.Lng, p.TrueAltitude, p.GroundSpeed, packPitchBankHeading(p.Pitch, p.Bank, p.Heading), p.PressureAltitude-p.TrueAltitude, PacketDelimeter)
|
||||
return fmt.Sprintf("@%s:%s:%s:%d:%.6f:%.6f:%d:%d:%d:%d%s", xpdrStateStr, p.From, p.SquawkCode, p.NetworkRating, p.Lat, p.Lng, p.TrueAltitude, p.GroundSpeed, packPitchBankHeading(p.Pitch, p.Bank, p.Heading), p.PressureAltitude-p.TrueAltitude, PacketDelimiter)
|
||||
}
|
||||
|
||||
func ParsePilotPositionPDU(rawPacket string) (*PilotPositionPDU, error) {
|
||||
rawPacket = strings.TrimSuffix(rawPacket, PacketDelimeter)
|
||||
rawPacket = strings.TrimPrefix(rawPacket, "@")
|
||||
fields := strings.Split(rawPacket, Delimeter)
|
||||
if len(fields) != 10 {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
func (p *PilotPositionPDU) Parse(packet string) error {
|
||||
packet = strings.TrimSuffix(packet, PacketDelimiter)
|
||||
packet = strings.TrimPrefix(packet, "@")
|
||||
|
||||
networkRating, err := strconv.Atoi(fields[3])
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
|
||||
lat, err := strconv.ParseFloat(fields[4], 64)
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
|
||||
lng, err := strconv.ParseFloat(fields[5], 64)
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
|
||||
trueAlt, err := strconv.Atoi(fields[6])
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
|
||||
groundspeed, err := strconv.Atoi(fields[7])
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
|
||||
pbh64, err := strconv.ParseUint(fields[8], 10, 32)
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
pbh := uint32(pbh64)
|
||||
|
||||
pitch, bank, heading := unpackPitchBankHeading(pbh)
|
||||
|
||||
pressureAlt, err := strconv.Atoi(fields[9])
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
pressureAlt += trueAlt
|
||||
|
||||
identing := false
|
||||
modeC := false
|
||||
if fields[0] == "N" {
|
||||
modeC = true
|
||||
} else if fields[0] == "Y" {
|
||||
modeC = true
|
||||
identing = true
|
||||
} else if fields[0] != "S" {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
var fields []string
|
||||
if fields = strings.Split(packet, Delimiter); len(fields) != 10 {
|
||||
return NewGenericFSDError(SyntaxError, "", "invalid parameter count")
|
||||
}
|
||||
|
||||
pdu := PilotPositionPDU{
|
||||
SquawkingModeC: modeC,
|
||||
Identing: identing,
|
||||
From: fields[1],
|
||||
SquawkCode: fields[2],
|
||||
NetworkRating: networkRating,
|
||||
Lat: lat,
|
||||
Lng: lng,
|
||||
TrueAltitude: trueAlt,
|
||||
PressureAltitude: pressureAlt,
|
||||
GroundSpeed: groundspeed,
|
||||
Pitch: pitch,
|
||||
Heading: bank,
|
||||
Bank: heading,
|
||||
From: fields[1],
|
||||
SquawkCode: fields[2],
|
||||
}
|
||||
|
||||
err = V.Struct(pdu)
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
var err error
|
||||
|
||||
// Parse numeric fields
|
||||
if pdu.NetworkRating, err = strconv.Atoi(fields[3]); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[3], "invalid network rating")
|
||||
}
|
||||
|
||||
if pdu.Lat, err = strconv.ParseFloat(fields[4], 64); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[4], "invalid latitude")
|
||||
}
|
||||
|
||||
if pdu.Lng, err = strconv.ParseFloat(fields[5], 64); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[5], "invalid longitude")
|
||||
}
|
||||
|
||||
if pdu.TrueAltitude, err = strconv.Atoi(fields[6]); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[6], "invalid true altitude")
|
||||
}
|
||||
|
||||
if pdu.GroundSpeed, err = strconv.Atoi(fields[7]); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[7], "invalid groundspeed")
|
||||
}
|
||||
|
||||
if pdu.PressureAltitude, err = strconv.Atoi(fields[9]); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[9], "invalid pressure altitude")
|
||||
}
|
||||
|
||||
pdu.PressureAltitude += pdu.TrueAltitude
|
||||
|
||||
// Parse pitch/bank/heading
|
||||
var pbh64 uint64
|
||||
if pbh64, err = strconv.ParseUint(fields[8], 10, 32); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[8], "invalid pitch/bank/heading integer")
|
||||
}
|
||||
pdu.Pitch, pdu.Bank, pdu.Heading = unpackPitchBankHeading(uint32(pbh64))
|
||||
|
||||
switch fields[0] {
|
||||
case "N":
|
||||
pdu.SquawkingModeC = true
|
||||
case "Y":
|
||||
pdu.SquawkingModeC = true
|
||||
pdu.Identing = true
|
||||
case "S":
|
||||
default:
|
||||
return NewGenericFSDError(SyntaxError, fields[0], "invalid transponder state identifier")
|
||||
}
|
||||
|
||||
// Validate
|
||||
if err = V.Struct(pdu); err != nil {
|
||||
if validatorErr := getFSDErrorFromValidatorErrors(err); err != nil {
|
||||
return validatorErr
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
// Check transponder code validity
|
||||
for _, char := range pdu.SquawkCode {
|
||||
if char < '0' || char > '7' {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
return NewGenericFSDError(SyntaxError, fields[2], "invalid transponder code")
|
||||
}
|
||||
}
|
||||
|
||||
return &pdu, nil
|
||||
// Copy new pdu into receiver
|
||||
*p = pdu
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user