Compare commits

..
2 Commits
4 changed files with 32 additions and 19 deletions
+21 -14
View File
@@ -296,21 +296,25 @@ func (c *Client) DispenserStart(ctx context.Context) (string, error) {
return stockStatus, fmt.Errorf("[%s] to encoder: %w", funcName, err) return stockStatus, fmt.Errorf("[%s] to encoder: %w", funcName, err)
} }
deadline := time.Now().Add(6 * time.Second) halfway := time.Now().Add(6 * time.Second)
deadline := time.Now().Add(12 * time.Second)
for { for {
time.Sleep(delay * 2) time.Sleep(delay * 2)
if time.Now().After(deadline) { switch {
return stockStatus, fmt.Errorf("[%s] timeout waiting keycard at encoder position", funcName) case time.Now().After(halfway):
if err := c.ToEncoder(ctx); err != nil {
return stockStatus, fmt.Errorf("[%s] to encoder: %w", funcName, err)
}
case time.Now().After(deadline):
return stockStatus, nil
} }
status, err = c.do(ctx, cmdStatus) status, _ = c.do(ctx, cmdStatus)
if err != nil {
return stockStatus, fmt.Errorf("[%s] re-check status: %w", funcName, err)
}
stockStatus = stockTake(status) stockStatus = stockTake(status)
c.setStock(status) c.setStock(status)
logStatus(status)
// error states first // error states first
if isCardWellEmpty(status) { if isCardWellEmpty(status) {
@@ -347,25 +351,28 @@ func (c *Client) DispenserFinal(ctx context.Context) (string, error) {
logStatus(status) logStatus(status)
}() }()
deadline := time.Now().Add(6 * time.Second) halfway := time.Now().Add(6 * time.Second)
deadline := time.Now().Add(12 * time.Second)
for { for {
time.Sleep(delay * 2) time.Sleep(delay * 2)
if time.Now().After(deadline) { switch {
case time.Now().After(halfway):
if err := c.ToEncoder(ctx); err != nil {
return stockStatus, fmt.Errorf("[%s] to encoder: %w", funcName, err)
}
case time.Now().After(deadline):
return stockStatus, nil return stockStatus, nil
} }
status, err = c.do(ctx, cmdStatus) status, _ = c.do(ctx, cmdStatus)
if err != nil {
return stockStatus, nil
}
stockStatus = stockTake(status) stockStatus = stockTake(status)
c.setStock(status) c.setStock(status)
logStatus(status) logStatus(status)
if isCardWellEmpty(status) { if isCardWellEmpty(status) {
return stockStatus, fmt.Errorf(stockStatus) return stockStatus, nil
} }
if isAtEncoderPosition(status) { if isAtEncoderPosition(status) {
+4 -4
View File
@@ -1,15 +1,16 @@
// Package lockserver provides functionality for interacting with Assa Abloy lock servers.
package lockserver package lockserver
import ( import (
"fmt" "fmt"
"net" "net"
"time"
"strings" "strings"
"time"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )
// Build key encoding request command for the Assa Abloy lock server. // BuildCommand builds a key encoding request command for the Assa Abloy lock server.
func (lock *AssaLockServer) BuildCommand(doorReq DoorCardRequest, checkIn, checkOut time.Time) error { func (lock *AssaLockServer) BuildCommand(doorReq DoorCardRequest, checkIn, checkOut time.Time) error {
ci := checkIn.Format("200601021504") ci := checkIn.Format("200601021504")
co := checkOut.Format("200601021504") co := checkOut.Format("200601021504")
@@ -71,4 +72,3 @@ func parseAssaResponse(raw string) (string, error) {
} }
return "Success: " + clean, nil return "Success: " + clean, nil
} }
+1 -1
View File
@@ -29,7 +29,7 @@ import (
) )
const ( const (
buildVersion = "1.2.4" buildVersion = "1.2.6"
serviceName = "hardlink" serviceName = "hardlink"
pollingFrequency = 8 * time.Second pollingFrequency = 8 * time.Second
) )
+6
View File
@@ -2,6 +2,12 @@
builtVersion is a const in main.go builtVersion is a const in main.go
#### 1.2.6 - 20 April 2026
added the second attempt to send the card to the encoder after 6 seconds
#### 1.2.5 - 20 March 2026
removed early return on error when checking dispenser status in the start and final loops.
#### 1.2.4 - 18 March 2026 #### 1.2.4 - 18 March 2026
added check if keycard at the encoder position before trying to encode key added check if keycard at the encoder position before trying to encode key