mirror of
https://github.com/renorris/openfsd
synced 2026-03-30 11:05:34 +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:
Reese Norris
@@ -20,7 +20,7 @@ type VelocityVector struct {
|
||||
|
||||
type FastPilotPositionPDU struct {
|
||||
Type int `validate:"min=0,max=2"`
|
||||
From string `validate:"required,alphanum,max=7"`
|
||||
From string `validate:"required,alphanum,max=16"`
|
||||
Lat float64 `validate:"min=-90.0,max=90.0"`
|
||||
Lng float64 `validate:"min=-180.0,max=180.0"`
|
||||
AltitudeTrue float64 `validate:"min=-1500.0,max=99999.0"`
|
||||
@@ -36,143 +36,132 @@ type FastPilotPositionPDU struct {
|
||||
func (p *FastPilotPositionPDU) Serialize() string {
|
||||
switch p.Type {
|
||||
case FastPilotPositionTypeFast:
|
||||
return fmt.Sprintf("^%s:%.6f:%.6f:%.2f:%.2f:%d:%.4f:%.4f:%.4f:%.4f:%.4f:%.4f:%.2f%s", p.From, p.Lat, p.Lng, p.AltitudeTrue, p.AltitudeAgl, packPitchBankHeading(p.Pitch, p.Bank, p.Heading), p.PositionalVelocityVector.X, p.PositionalVelocityVector.Y, p.PositionalVelocityVector.Z, p.RotationalVelocityVector.X, p.RotationalVelocityVector.Y, p.RotationalVelocityVector.Z, p.NoseGearAngle, PacketDelimeter)
|
||||
return fmt.Sprintf("^%s:%.6f:%.6f:%.2f:%.2f:%d:%.4f:%.4f:%.4f:%.4f:%.4f:%.4f:%.2f%s",
|
||||
p.From, p.Lat, p.Lng, p.AltitudeTrue,
|
||||
p.AltitudeAgl, packPitchBankHeading(p.Pitch, p.Bank, p.Heading),
|
||||
p.PositionalVelocityVector.X, p.PositionalVelocityVector.Y,
|
||||
p.PositionalVelocityVector.Z, p.RotationalVelocityVector.X,
|
||||
p.RotationalVelocityVector.Y, p.RotationalVelocityVector.Z,
|
||||
p.NoseGearAngle, PacketDelimiter)
|
||||
|
||||
case FastPilotPositionTypeSlow:
|
||||
return fmt.Sprintf("#SL%s:%.6f:%.6f:%.2f:%.2f:%d:%.4f:%.4f:%.4f:%.4f:%.4f:%.4f:%.2f%s", p.From, p.Lat, p.Lng, p.AltitudeTrue, p.AltitudeAgl, packPitchBankHeading(p.Pitch, p.Bank, p.Heading), p.PositionalVelocityVector.X, p.PositionalVelocityVector.Y, p.PositionalVelocityVector.Z, p.RotationalVelocityVector.X, p.RotationalVelocityVector.Y, p.RotationalVelocityVector.Z, p.NoseGearAngle, PacketDelimeter)
|
||||
return fmt.Sprintf("#SL%s:%.6f:%.6f:%.2f:%.2f:%d:%.4f:%.4f:%.4f:%.4f:%.4f:%.4f:%.2f%s",
|
||||
p.From, p.Lat, p.Lng, p.AltitudeTrue,
|
||||
p.AltitudeAgl, packPitchBankHeading(p.Pitch, p.Bank, p.Heading),
|
||||
p.PositionalVelocityVector.X, p.PositionalVelocityVector.Y,
|
||||
p.PositionalVelocityVector.Z, p.RotationalVelocityVector.X,
|
||||
p.RotationalVelocityVector.Y, p.RotationalVelocityVector.Z,
|
||||
p.NoseGearAngle, PacketDelimiter)
|
||||
|
||||
default: // FastPilotPositionTypeStopped
|
||||
return fmt.Sprintf("#ST%s:%.6f:%.6f:%.2f:%.2f:%d:%.2f%s", p.From, p.Lat, p.Lng, p.AltitudeTrue, p.AltitudeAgl, packPitchBankHeading(p.Pitch, p.Bank, p.Heading), p.NoseGearAngle, PacketDelimeter)
|
||||
return fmt.Sprintf("#ST%s:%.6f:%.6f:%.2f:%.2f:%d:%.2f%s",
|
||||
p.From, p.Lat, p.Lng, p.AltitudeTrue, p.AltitudeAgl,
|
||||
packPitchBankHeading(p.Pitch, p.Bank, p.Heading),
|
||||
p.NoseGearAngle, PacketDelimiter)
|
||||
}
|
||||
}
|
||||
|
||||
func ParseFastPilotPositionPDU(rawPacket string) (*FastPilotPositionPDU, error) {
|
||||
rawPacket = strings.TrimSuffix(rawPacket, PacketDelimeter)
|
||||
func (p *FastPilotPositionPDU) Parse(packet string) error {
|
||||
packet = strings.TrimSuffix(packet, PacketDelimiter)
|
||||
|
||||
// Determine type
|
||||
var pduType int
|
||||
if strings.HasPrefix(rawPacket, "^") {
|
||||
if strings.HasPrefix(packet, "^") {
|
||||
pduType = FastPilotPositionTypeFast
|
||||
rawPacket = strings.TrimPrefix(rawPacket, "^")
|
||||
} else if strings.HasPrefix(rawPacket, "#SL") {
|
||||
packet = strings.TrimPrefix(packet, "^")
|
||||
} else if strings.HasPrefix(packet, "#SL") {
|
||||
pduType = FastPilotPositionTypeSlow
|
||||
rawPacket = strings.TrimPrefix(rawPacket, "#SL")
|
||||
} else if strings.HasPrefix(rawPacket, "#ST") {
|
||||
packet = strings.TrimPrefix(packet, "#SL")
|
||||
} else if strings.HasPrefix(packet, "#ST") {
|
||||
pduType = FastPilotPositionTypeStopped
|
||||
rawPacket = strings.TrimPrefix(rawPacket, "#ST")
|
||||
packet = strings.TrimPrefix(packet, "#ST")
|
||||
} else {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
return NewGenericFSDError(SyntaxError, "", "invalid packet prefix")
|
||||
}
|
||||
|
||||
fields := strings.Split(rawPacket, Delimeter)
|
||||
|
||||
fields := strings.Split(packet, Delimiter)
|
||||
if pduType == FastPilotPositionTypeStopped {
|
||||
if len(fields) != 7 {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
return NewGenericFSDError(SyntaxError, "", "invalid parameter count")
|
||||
}
|
||||
} else {
|
||||
if len(fields) != 13 {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
}
|
||||
|
||||
lat, err := strconv.ParseFloat(fields[1], 64)
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
|
||||
lng, err := strconv.ParseFloat(fields[2], 64)
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
|
||||
altTrue, err := strconv.ParseFloat(fields[3], 64)
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
|
||||
altAgl, err := strconv.ParseFloat(fields[4], 64)
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
|
||||
pbh, err := strconv.ParseUint(fields[5], 10, 32)
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
pitch, bank, heading := unpackPitchBankHeading(uint32(pbh))
|
||||
|
||||
var positionalVector VelocityVector
|
||||
var rotationalVector VelocityVector
|
||||
var noseGearAngle float64
|
||||
if pduType == FastPilotPositionTypeStopped {
|
||||
positionalVector = VelocityVector{
|
||||
X: 0,
|
||||
Y: 0,
|
||||
Z: 0,
|
||||
}
|
||||
rotationalVector = VelocityVector{
|
||||
X: 0,
|
||||
Y: 0,
|
||||
Z: 0,
|
||||
}
|
||||
noseGearAngle, err = strconv.ParseFloat(fields[6], 64)
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
} else {
|
||||
positionalVector.X, err = strconv.ParseFloat(fields[6], 64)
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
|
||||
positionalVector.Y, err = strconv.ParseFloat(fields[7], 64)
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
|
||||
positionalVector.Z, err = strconv.ParseFloat(fields[8], 64)
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
|
||||
rotationalVector.X, err = strconv.ParseFloat(fields[9], 64)
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
|
||||
rotationalVector.Y, err = strconv.ParseFloat(fields[10], 64)
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
|
||||
rotationalVector.Z, err = strconv.ParseFloat(fields[11], 64)
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
}
|
||||
|
||||
noseGearAngle, err = strconv.ParseFloat(fields[12], 64)
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
return NewGenericFSDError(SyntaxError, "", "invalid parameter count")
|
||||
}
|
||||
}
|
||||
|
||||
pdu := FastPilotPositionPDU{
|
||||
Type: pduType,
|
||||
From: fields[0],
|
||||
Lat: lat,
|
||||
Lng: lng,
|
||||
AltitudeTrue: altTrue,
|
||||
AltitudeAgl: altAgl,
|
||||
Pitch: pitch,
|
||||
Heading: heading,
|
||||
Bank: bank,
|
||||
PositionalVelocityVector: positionalVector,
|
||||
RotationalVelocityVector: rotationalVector,
|
||||
NoseGearAngle: noseGearAngle,
|
||||
Type: pduType,
|
||||
From: fields[0],
|
||||
}
|
||||
|
||||
err = V.Struct(pdu)
|
||||
if err != nil {
|
||||
return nil, NewGenericFSDError(SyntaxError)
|
||||
var err error
|
||||
|
||||
// Parse numeric fields
|
||||
if pdu.Lat, err = strconv.ParseFloat(fields[1], 64); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[1], "invalid latitude")
|
||||
}
|
||||
|
||||
return &pdu, nil
|
||||
if pdu.Lng, err = strconv.ParseFloat(fields[2], 64); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[2], "invalid longitude")
|
||||
}
|
||||
|
||||
if pdu.AltitudeTrue, err = strconv.ParseFloat(fields[3], 64); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[3], "invalid true altitude")
|
||||
}
|
||||
|
||||
if pdu.AltitudeAgl, err = strconv.ParseFloat(fields[4], 64); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[4], "invalid above-ground-level altitude")
|
||||
}
|
||||
|
||||
// Parse pitch/bank/heading
|
||||
var pbh uint64
|
||||
if pbh, err = strconv.ParseUint(fields[5], 10, 32); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[5], "invalid pitch/bank/heading integer")
|
||||
}
|
||||
pdu.Pitch, pdu.Bank, pdu.Heading = unpackPitchBankHeading(uint32(pbh))
|
||||
|
||||
if pduType == FastPilotPositionTypeStopped {
|
||||
// Set zero values for velocity and rotational vectors
|
||||
pdu.PositionalVelocityVector = VelocityVector{}
|
||||
pdu.RotationalVelocityVector = VelocityVector{}
|
||||
if pdu.NoseGearAngle, err = strconv.ParseFloat(fields[6], 64); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[6], "invalid nose gear angle")
|
||||
}
|
||||
} else {
|
||||
// Parse values
|
||||
if pdu.PositionalVelocityVector.X, err = strconv.ParseFloat(fields[6], 64); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[6], "invalid positional X velocity vector")
|
||||
}
|
||||
if pdu.PositionalVelocityVector.Y, err = strconv.ParseFloat(fields[7], 64); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[7], "invalid positional Y velocity vector")
|
||||
}
|
||||
if pdu.PositionalVelocityVector.Z, err = strconv.ParseFloat(fields[8], 64); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[8], "invalid positional Z velocity vector")
|
||||
}
|
||||
if pdu.RotationalVelocityVector.X, err = strconv.ParseFloat(fields[9], 64); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[9], "invalid rotational X velocity vector")
|
||||
}
|
||||
if pdu.RotationalVelocityVector.Y, err = strconv.ParseFloat(fields[10], 64); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[10], "invalid rotational Y velocity vector")
|
||||
}
|
||||
if pdu.RotationalVelocityVector.Z, err = strconv.ParseFloat(fields[11], 64); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[11], "invalid rotational Z velocity vector")
|
||||
}
|
||||
if pdu.NoseGearAngle, err = strconv.ParseFloat(fields[12], 64); err != nil {
|
||||
return NewGenericFSDError(SyntaxError, fields[12], "invalid nose gear angle")
|
||||
}
|
||||
}
|
||||
|
||||
if err = V.Struct(&pdu); err != nil {
|
||||
if validatorErr := getFSDErrorFromValidatorErrors(err); err != nil {
|
||||
return validatorErr
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
// Copy new pdu into receiver
|
||||
*p = pdu
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user