Compare commits

...
4 Commits
3 changed files with 108 additions and 84 deletions
+8 -8
View File
@@ -31,8 +31,8 @@ func calculateLRC(data []byte) byte {
func (lock *SaltoLockServer) BuildCommand(req DoorCardRequest, checkIn, checkOut time.Time) error { func (lock *SaltoLockServer) BuildCommand(req DoorCardRequest, checkIn, checkOut time.Time) error {
// helper: hh[mm]DDMMYY // helper: hh[mm]DDMMYY
fmtStamp := func(t time.Time) string { fmtStamp := func(t time.Time) string {
return fmt.Sprintf("%02d%02d%02d%02d%02d", return fmt.Sprintf("%02d%02d%02d%02d",
t.Hour(), t.Minute(), t.Day(), int(t.Month()), t.Year()%100) t.Hour(), t.Day(), int(t.Month()), t.Year()%100)
} }
start := fmtStamp(checkIn) start := fmtStamp(checkIn)
expiry := fmtStamp(checkOut) expiry := fmtStamp(checkOut)
@@ -140,7 +140,7 @@ func (lock *SaltoLockServer) waitForAck(conn net.Conn, reader *bufio.Reader, tim
// LockSequence performs the full ENQ/ACK handshake and command exchange // LockSequence performs the full ENQ/ACK handshake and command exchange
func (lock *SaltoLockServer) LockSequence() error { func (lock *SaltoLockServer) LockSequence() error {
const timeout = 10 * time.Second const timeout = 20 * time.Second
var ( var (
resp []byte resp []byte
drained = 0 // count of stale frames consumed across waits drained = 0 // count of stale frames consumed across waits
@@ -152,7 +152,7 @@ func (lock *SaltoLockServer) LockSequence() error {
} }
defer conn.Close() defer conn.Close()
reader := bufio.NewReader(conn) reader := bufio.NewReader(conn)
// 1. Send ENQ // 1. Send ENQ
log.Infof("Sending ENQ") log.Infof("Sending ENQ")
@@ -178,7 +178,7 @@ func (lock *SaltoLockServer) LockSequence() error {
// 5. Now read the *next* STX frame which should be the response to our command. // 5. Now read the *next* STX frame which should be the response to our command.
for { for {
conn.SetReadDeadline(time.Now().Add(20 * time.Second)) conn.SetReadDeadline(time.Now().Add(40 * time.Second))
b, e := reader.ReadByte() b, e := reader.ReadByte()
if e != nil { if e != nil {
return fmt.Errorf("error reading response start: %w", e) return fmt.Errorf("error reading response start: %w", e)
@@ -210,11 +210,11 @@ func (lock *SaltoLockServer) LockSequence() error {
case b1 == 'C' && b2 == 'C': case b1 == 'C' && b2 == 'C':
log.Infof("LockSequence: command response is CC (follow-up)") log.Infof("LockSequence: command response is CC (follow-up)")
case b1 == 'T' && b2 == 'D': case b1 == 'T' && b2 == 'D':
log.Warnf("LockSequence: command response is TD (room does not exist)") log.Warnf("LockSequence: command response is TD (room does not exist): %q", string(resp))
return fmt.Errorf("lock response indicates room does not exist") return fmt.Errorf("lock response indicates room does not exist: %q", string(resp))
default: default:
log.Warnf("LockSequence: unexpected command response %q", string(resp)) log.Warnf("LockSequence: unexpected command response %q", string(resp))
return fmt.Errorf("error encoding keycard, unexpected response") return fmt.Errorf("error encoding keycard, unexpected response: %q", string(resp))
} }
} else { } else {
log.Warnf("LockSequence: response too short: %q", string(resp)) log.Warnf("LockSequence: response too short: %q", string(resp))
+90 -75
View File
@@ -29,7 +29,7 @@ import (
) )
const ( const (
buildVersion = "1.0.18" buildVersion = "1.0.21"
serviceName = "hardlink" serviceName = "hardlink"
customLayout = "2006-01-02 15:04:05 -0700" customLayout = "2006-01-02 15:04:05 -0700"
transactionUrl = "http://127.0.0.1:18181/start-transaction/" transactionUrl = "http://127.0.0.1:18181/start-transaction/"
@@ -47,6 +47,7 @@ type configRec struct {
PrinterName string `yaml:"printerName"` PrinterName string `yaml:"printerName"`
LogDir string `yaml:"logdir"` LogDir string `yaml:"logdir"`
IsPayment bool `yaml:"isPayment"` IsPayment bool `yaml:"isPayment"`
TestMode bool `yaml:"testMode"`
} }
// App holds shared resources. // App holds shared resources.
@@ -71,6 +72,7 @@ func main() {
printer.PrinterName = config.PrinterName printer.PrinterName = config.PrinterName
lockserver.Cert = config.Cert lockserver.Cert = config.Cert
lockserver.LockServerURL = config.LockserverUrl lockserver.LockServerURL = config.LockserverUrl
dispHandle := &serial.Port{}
// Setup logging and get file handle // Setup logging and get file handle
logFile, err := setupLogging(config.LogDir) logFile, err := setupLogging(config.LogDir)
@@ -80,25 +82,27 @@ func main() {
defer logFile.Close() defer logFile.Close()
// Initialize dispenser // Initialize dispenser
dispenser.SerialPort = config.DispenserPort if !config.TestMode {
dispenser.Address = []byte(config.DispenserAdrr) dispenser.SerialPort = config.DispenserPort
dispHandle, err := dispenser.InitializeDispenser() dispenser.Address = []byte(config.DispenserAdrr)
if err != nil { dispHandle, err = dispenser.InitializeDispenser()
fatalError(err) if err != nil {
}
defer dispHandle.Close()
status, err := dispenser.CheckDispenserStatus(dispHandle)
if err != nil {
if len(status) == 0 {
err = fmt.Errorf("%s; wrong dispenser address: %s", err, config.DispenserAdrr)
fatalError(err) fatalError(err)
} else {
fmt.Println(status)
fmt.Println(err.Error())
} }
defer dispHandle.Close()
status, err := dispenser.CheckDispenserStatus(dispHandle)
if err != nil {
if len(status) == 0 {
err = fmt.Errorf("%s; wrong dispenser address: %s", err, config.DispenserAdrr)
fatalError(err)
} else {
fmt.Println(status)
fmt.Println(err.Error())
}
}
log.Infof("Dispenser initialized on port %s, %s", config.DispenserPort, status)
} }
log.Infof("Dispenser initialized on port %s, %s", config.DispenserPort, status)
// Test lock-server connection // Test lock-server connection
switch strings.ToLower(config.LockType) { switch strings.ToLower(config.LockType) {
@@ -107,71 +111,25 @@ func main() {
default: default:
lockConn, err := lockserver.InitializeServerConnection(config.LockserverUrl) lockConn, err := lockserver.InitializeServerConnection(config.LockserverUrl)
if err != nil { if err != nil {
fatalError(err) fmt.Println(err.Error())
log.Errorf(err.Error())
} else {
fmt.Printf("Connected to the lock server successfuly at %s\n", config.LockserverUrl)
log.Infof("Connected to the lock server successfuly at %s", config.LockserverUrl)
lockConn.Close()
} }
log.Infof("Connectting to lock server at %s", config.LockserverUrl)
lockConn.Close()
} }
if config.IsPayment { if config.IsPayment {
startClient := func() (*exec.Cmd, error) { fmt.Println("Payment processing is enabled")
cmd := exec.Command("./ChipDNAClient/ChipDnaClient.exe") log.Info("Payment processing is enabled")
err := cmd.Start() startChipDnaClient()
if err != nil { } else {
return nil, fmt.Errorf("failed to start ChipDnaClient: %v", err) fmt.Println("Payment processing is disabled")
} log.Info("Payment processing is disabled")
log.Infof("ChipDnaClient started with PID %d", cmd.Process.Pid)
return cmd, nil
}
cmd, err := startClient()
if err != nil {
fatalError(err)
}
// Restart loop
go func() {
for {
err := cmd.Wait()
if err != nil {
log.Errorf("ChipDnaClient exited unexpectedly: %v", err)
time.Sleep(2 * time.Second)
cmd, err = startClient()
if err != nil {
log.Errorf("Restart failed: %v", err)
return
}
log.Info("ChipDnaClient restarted successfully")
}
}
}()
// Handle shutdown signals
sigs := make(chan os.Signal, 1)
signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
go func() {
<-sigs
log.Info("Shutting down...")
if cmd.Process != nil {
log.Info("Sending SIGTERM to ChipDnaClient...")
_ = cmd.Process.Signal(syscall.SIGTERM)
// wait up to 5s for graceful shutdown
done := make(chan error, 1)
go func() { done <- cmd.Wait() }()
select {
case <-time.After(5 * time.Second):
log.Warn("ChipDnaClient did not exit in time, killing...")
_ = cmd.Process.Kill()
case err := <-done:
log.Infof("ChipDnaClient exited cleanly: %v", err)
}
}
os.Exit(0)
}()
} }
// Create App and wire routes // Create App and wire routes
// dispHandle := &serial.Port{} // Placeholder, replace with actual dispenser handle
app := newApp(dispHandle, config) app := newApp(dispHandle, config)
mux := http.NewServeMux() mux := http.NewServeMux()
@@ -529,3 +487,60 @@ func readTicketLayout() printer.LayoutOptions {
return layout return layout
} }
func startChipDnaClient() {
startClient := func() (*exec.Cmd, error) {
cmd := exec.Command("./ChipDNAClient/ChipDnaClient.exe")
err := cmd.Start()
if err != nil {
return nil, fmt.Errorf("failed to start ChipDnaClient: %v", err)
}
log.Infof("ChipDnaClient started with PID %d", cmd.Process.Pid)
return cmd, nil
}
cmd, err := startClient()
if err != nil {
fatalError(err)
}
// Restart loop
go func() {
for {
err := cmd.Wait()
if err != nil {
log.Errorf("ChipDnaClient exited unexpectedly: %v", err)
time.Sleep(2 * time.Second)
cmd, err = startClient()
if err != nil {
log.Errorf("Restart failed: %v", err)
return
}
log.Info("ChipDnaClient restarted successfully")
}
}
}()
// Handle shutdown signals
sigs := make(chan os.Signal, 1)
signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
go func() {
<-sigs
log.Info("Shutting down...")
if cmd.Process != nil {
log.Info("Sending SIGTERM to ChipDnaClient...")
_ = cmd.Process.Signal(syscall.SIGTERM)
// wait up to 5s for graceful shutdown
done := make(chan error, 1)
go func() { done <- cmd.Wait() }()
select {
case <-time.After(5 * time.Second):
log.Warn("ChipDnaClient did not exit in time, killing...")
_ = cmd.Process.Kill()
case err := <-done:
log.Infof("ChipDnaClient exited cleanly: %v", err)
}
}
os.Exit(0)
}()
}
+9
View File
@@ -2,6 +2,15 @@
builtVersion is a const in main.go builtVersion is a const in main.go
#### 1.0.21 - 20 October 2025
increased timeout for Salto lock server connection to 40 seconds
#### 1.0.20 - 06 October 2025
removed minutes from the start and expiry time in Salto lock command
#### 1.0.19 - 10 September 2025
allowed to continue if the connection to the lock server fails at startup
#### 1.0.18 - 04 September 2025 #### 1.0.18 - 04 September 2025
increased timeout for TLJ lock server connection to 30 seconds increased timeout for TLJ lock server connection to 30 seconds