added check if the room exists

This commit is contained in:
2025-07-25 17:36:08 +01:00
parent fc91f2c0f2
commit 25eab0dc75
3 changed files with 37 additions and 13 deletions
+31 -10
View File
@@ -77,6 +77,8 @@ func (lock *SaltoLockServer) BuildCommand(req DoorCardRequest, checkIn, checkOut
// LockSequence performs the full ENQ/ACK handshake and command exchange
func (lock *SaltoLockServer) LockSequence(conn net.Conn) error {
log.Infof("Sending command: %q", string(lock.command))
const timeout = 10 * time.Second
reader := bufio.NewReader(conn)
@@ -96,7 +98,7 @@ func (lock *SaltoLockServer) LockSequence(conn net.Conn) error {
return fmt.Errorf("expected ACK after ENQ, got 0x%X", b)
}
// 3. Send the command frame
// 3. Send command frame
if _, err := conn.Write(lock.command); err != nil {
return fmt.Errorf("failed to send command frame: %w", err)
}
@@ -113,18 +115,37 @@ func (lock *SaltoLockServer) LockSequence(conn net.Conn) error {
return fmt.Errorf("expected ACK to command, got 0x%X", b)
}
// 5. Read response: expect STX
// 5. Expect STX
conn.SetReadDeadline(time.Now().Add(timeout))
b, err = reader.ReadByte()
stx, err := reader.ReadByte()
if err != nil {
return fmt.Errorf("error reading response STX: %w", err)
return fmt.Errorf("error reading STX: %w", err)
}
if b != STX {
return fmt.Errorf("expected STX at response start, got 0x%X", b)
if stx != STX {
return fmt.Errorf("expected STX, got 0x%X", stx)
}
conn.SetReadDeadline(time.Now().Add(timeout))
_ , err = reader.ReadByte()
if err != nil {
return fmt.Errorf("error reading separator after STX: %w", err)
}
// 6. Read until ETX
var resp []byte
// 6. Read next two bytes and check for TD error
conn.SetReadDeadline(time.Now().Add(timeout))
b1, err := reader.ReadByte()
if err != nil {
return fmt.Errorf("error reading first response byte: %w", err)
}
b2, err := reader.ReadByte()
if err != nil {
return fmt.Errorf("error reading second response byte: %w", err)
}
if b1 == 'T' && b2 == 'D' {
return fmt.Errorf("lock response indicates room does not exist (TD)")
}
// 7. Continue reading until ETX
resp := []byte{b1, b2}
for {
conn.SetReadDeadline(time.Now().Add(timeout))
c, err := reader.ReadByte()
@@ -137,7 +158,7 @@ func (lock *SaltoLockServer) LockSequence(conn net.Conn) error {
}
}
// 7. (Optional) Read LRC or final CR
// 8. Optional: read LRC or trailing byte
conn.SetReadDeadline(time.Now().Add(timeout))
if lrc, err := reader.ReadByte(); err == nil {
resp = append(resp, lrc)
@@ -145,6 +166,6 @@ func (lock *SaltoLockServer) LockSequence(conn net.Conn) error {
log.Warnf("LockSequence: failed to read trailing LRC/CR: %v", err)
}
log.Infof("LockSequence: received response: % X", resp)
log.Infof("LockSequence: received response: %q", string(resp))
return nil
}