Compare commits

..
6 Commits
8 changed files with 123 additions and 40 deletions
+66 -25
View File
@@ -279,7 +279,9 @@ func (c *Client) DispenserStart(ctx context.Context) (string, error) {
return stockStatus, fmt.Errorf("[%s] check status: %w", funcName, err) return stockStatus, fmt.Errorf("[%s] check status: %w", funcName, err)
} }
logStatus(status) defer func() {
logStatus(status)
}()
stockStatus = stockTake(status) stockStatus = stockTake(status)
c.setStock(status) c.setStock(status)
@@ -294,48 +296,87 @@ 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)
} }
time.Sleep(delay) halfway := time.Now().Add(6 * time.Second)
status, err = c.CheckStatus(ctx) deadline := time.Now().Add(12 * time.Second)
if err != nil {
return stockStatus, fmt.Errorf("[%s] re-check status: %w", funcName, err)
}
logStatus(status)
stockStatus = stockTake(status)
c.setStock(status)
return stockStatus, nil for {
time.Sleep(delay * 2)
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
}
status, _ = c.do(ctx, cmdStatus)
stockStatus = stockTake(status)
c.setStock(status)
logStatus(status)
// error states first
if isCardWellEmpty(status) {
return stockStatus, fmt.Errorf(stockStatus)
}
if isAtEncoderPosition(status) {
return stockStatus, nil
}
}
} }
func (c *Client) DispenserFinal(ctx context.Context) (string, error) { func (c *Client) DispenserFinal(ctx context.Context) (string, error) {
const funcName = "DispenserFinal" const funcName = "DispenserFinal"
stockStatus := "" stockStatus := ""
var status []byte
if err := c.OutOfMouth(ctx); err != nil { if err := c.OutOfMouth(ctx); err != nil {
return stockStatus, fmt.Errorf("[%s] out of mouth: %w", funcName, err) return stockStatus, fmt.Errorf("[%s] out of mouth: %w", funcName, err)
} }
time.Sleep(delay) time.Sleep(delay)
status, err := c.CheckStatus(ctx) status, err := c.do(ctx, cmdStatus)
if err != nil { if err == nil && len(status) >= 4 {
return stockStatus, fmt.Errorf("[%s] check status: %w", funcName, err) c.setStock(status)
} }
logStatus(status)
stockStatus = stockTake(status)
c.setStock(status)
time.Sleep(delay) time.Sleep(delay)
if err := c.ToEncoder(ctx); err != nil { if err := c.ToEncoder(ctx); err != nil {
return stockStatus, fmt.Errorf("[%s] to encoder: %w", funcName, err) return stockStatus, fmt.Errorf("[%s] to encoder: %w", funcName, err)
} }
time.Sleep(delay) defer func() {
status, err = c.CheckStatus(ctx) logStatus(status)
if err != nil { }()
return stockStatus, fmt.Errorf("[%s] re-check status: %w", funcName, err)
}
logStatus(status)
stockStatus = stockTake(status)
c.setStock(status)
return stockStatus, nil halfway := time.Now().Add(6 * time.Second)
deadline := time.Now().Add(12 * time.Second)
for {
time.Sleep(delay * 2)
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
}
status, _ = c.do(ctx, cmdStatus)
stockStatus = stockTake(status)
c.setStock(status)
logStatus(status)
if isCardWellEmpty(status) {
return stockStatus, nil
}
if isAtEncoderPosition(status) {
return stockStatus, nil
}
}
} }
+1
View File
@@ -191,6 +191,7 @@ func (app *App) takePayment(w http.ResponseWriter, r *http.Request) {
writeTransactionResult(w, http.StatusServiceUnavailable, theResponse) writeTransactionResult(w, http.StatusServiceUnavailable, theResponse)
return return
} }
} }
if r.Method == http.MethodOptions { if r.Method == http.MethodOptions {
+25 -5
View File
@@ -192,8 +192,13 @@ func (app *App) onChipDNAError(w http.ResponseWriter, r *http.Request) {
} }
func (app *App) handleAvailabilityDebounced(isAvailable bool) { func (app *App) handleAvailabilityDebounced(isAvailable bool) {
title := "ChipDNA Error" const (
key := fmt.Sprintf("%s-%d", app.cfg.Hotel, app.cfg.Kiosk) debounceDay = 30
debounceNight = 600
title = "ChipDNA Error"
)
key := app.availabilityKey()
app.availabilityMu.Lock() app.availabilityMu.Lock()
defer app.availabilityMu.Unlock() defer app.availabilityMu.Unlock()
@@ -213,14 +218,21 @@ func (app *App) handleAvailabilityDebounced(isAvailable bool) {
return return
} }
log.Println("PDQ reported unavailable - starting 10s debounce timer") debounce := debounceDay
timer := time.AfterFunc(60*time.Second, func() { hour := time.Now().Hour()
if hour < 6 {
debounce = debounceNight
}
log.Printf("PDQ reported unavailable - starting %ds debounce timer", debounce)
timer := time.AfterFunc(time.Duration(debounce)*time.Second, func() {
mail.SendEmailOnError( mail.SendEmailOnError(
app.cfg.Hotel, app.cfg.Hotel,
app.cfg.Kiosk, app.cfg.Kiosk,
title, title,
"ChipDNA PDQ unavailable for more than 60 seconds", fmt.Sprintf("ChipDNA PDQ unavailable for more than %d seconds", debounce),
) )
app.availabilityMu.Lock() app.availabilityMu.Lock()
@@ -230,3 +242,11 @@ func (app *App) handleAvailabilityDebounced(isAvailable bool) {
app.availabilityTimers[key] = timer app.availabilityTimers[key] = timer
} }
func (app *App) availabilityKey() string {
return fmt.Sprintf("hotel=%s|kiosk=%d|app=%p",
strings.TrimSpace(app.cfg.Hotel),
app.cfg.Kiosk,
app,
)
}
+3 -3
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
} }
+2 -2
View File
@@ -29,7 +29,7 @@ import (
) )
const ( const (
buildVersion = "1.2.1" buildVersion = "1.2.7"
serviceName = "hardlink" serviceName = "hardlink"
pollingFrequency = 8 * time.Second pollingFrequency = 8 * time.Second
) )
@@ -127,7 +127,7 @@ func main() {
if err != nil { if err != nil {
mail.SendEmailOnError(cfg.Hotel, cfg.Kiosk, "PDQ Status Read Error", err.Error()) mail.SendEmailOnError(cfg.Hotel, cfg.Kiosk, "PDQ Status Read Error", err.Error())
} else { } else {
fmt.Printf("PDQ availabile: %v\n", pdqstatus.IsAvailable) fmt.Printf("\nPDQ availabile: %v\n", pdqstatus.IsAvailable)
log.Infof("PDQ availabile: %v", pdqstatus.IsAvailable) log.Infof("PDQ availabile: %v", pdqstatus.IsAvailable)
} }
}() }()
+3 -2
View File
@@ -155,8 +155,9 @@ func BuildPreauthRedirectURL(result map[string]string) (string, bool) {
func BuildSuccessURL(result map[string]string) string { func BuildSuccessURL(result map[string]string) string {
q := url.Values{} q := url.Values{}
q.Set("CardNumber", hex.EncodeToString([]byte(result[types.PAN_MASKED]))) q.Set("CardNumber", hex.EncodeToString([]byte(result[types.PanMasked])))
q.Set("ExpiryDate", hex.EncodeToString([]byte(result[types.EXPIRY_DATE]))) q.Set("CardType", hex.EncodeToString([]byte(result[types.CardType])))
q.Set("ExpiryDate", hex.EncodeToString([]byte(result[types.ExpiryDate])))
q.Set("TxnReference", result[types.Reference]) q.Set("TxnReference", result[types.Reference])
q.Set("CardHash", hex.EncodeToString([]byte(result[types.CardHash]))) q.Set("CardHash", hex.EncodeToString([]byte(result[types.CardHash])))
q.Set("CardReference", hex.EncodeToString([]byte(result[types.CardReference]))) q.Set("CardReference", hex.EncodeToString([]byte(result[types.CardReference])))
+19
View File
@@ -2,6 +2,25 @@
builtVersion is a const in main.go builtVersion is a const in main.go
#### 1.2.7 - 13 May 2026
retrieve CardType from the ChepDNA response
#### 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
added check if keycard at the encoder position before trying to encode key
#### 1.2.3 - 17 March 2026
added check if keycard at the encoder position before trying to encode key
#### 1.2.2 - 11 February 2026
increased waiting time befor sending email on PDQ unavailability to 30 seconds day time and 10 minutes night time
to give it a chance to become available again
#### 1.2.1 - 09 February 2026 #### 1.2.1 - 09 February 2026
increased waiting time befor sending email on PDQ unavailability to 60 seconds increased waiting time befor sending email on PDQ unavailability to 60 seconds
+3 -2
View File
@@ -39,8 +39,9 @@ const (
ReceiptDataMerchant = "RECEIPT_DATA_MERCHANT" ReceiptDataMerchant = "RECEIPT_DATA_MERCHANT"
ReceiptDataCardholder = "RECEIPT_DATA_CARDHOLDER" ReceiptDataCardholder = "RECEIPT_DATA_CARDHOLDER"
Reference = "REFERENCE" Reference = "REFERENCE"
PAN_MASKED = "PAN_MASKED" CardType = "CARD_SCHEME_ID"
EXPIRY_DATE = "EXPIRY_DATE" PanMasked = "PAN_MASKED"
ExpiryDate = "EXPIRY_DATE"
TransactionResult = "TRANSACTION_RESULT" TransactionResult = "TRANSACTION_RESULT"
TransactionType = "TRANSACTION_TYPE" TransactionType = "TRANSACTION_TYPE"
TransactionState = "TRANSACTION_STATE" TransactionState = "TRANSACTION_STATE"