Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
56d33b167a | ||
|
|
bb526a248d | ||
|
|
f4f44da541 | ||
|
|
7993a2360d | ||
|
|
c15ceba78f | ||
|
|
04c664294d | ||
|
|
da5cafe031 | ||
|
|
efa415e631 | ||
|
|
f1dc0ccce4 | ||
|
|
1bceb55285 | ||
|
|
bb8cdb1d84 |
@@ -28,6 +28,7 @@ Checkin.code-workspace
|
|||||||
_obj
|
_obj
|
||||||
_test
|
_test
|
||||||
.vscode/
|
.vscode/
|
||||||
|
ChipDNAClient/
|
||||||
|
|
||||||
# Architecture specific extensions/prefixes
|
# Architecture specific extensions/prefixes
|
||||||
*.[568vq]
|
*.[568vq]
|
||||||
|
|||||||
@@ -0,0 +1,389 @@
|
|||||||
|
package handlers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"encoding/json"
|
||||||
|
"encoding/xml"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"github.com/tarm/serial"
|
||||||
|
|
||||||
|
"gitea.futuresens.co.uk/futuresens/cmstypes"
|
||||||
|
"gitea.futuresens.co.uk/futuresens/hardlink/dispenser"
|
||||||
|
"gitea.futuresens.co.uk/futuresens/hardlink/lockserver"
|
||||||
|
"gitea.futuresens.co.uk/futuresens/hardlink/payment"
|
||||||
|
"gitea.futuresens.co.uk/futuresens/hardlink/printer"
|
||||||
|
"gitea.futuresens.co.uk/futuresens/logging"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
customLayout = "2006-01-02 15:04:05 -0700"
|
||||||
|
transactionUrl = "http://127.0.0.1:18181/start-transaction/"
|
||||||
|
)
|
||||||
|
|
||||||
|
type App struct {
|
||||||
|
dispPort *serial.Port
|
||||||
|
lockserver lockserver.LockServer
|
||||||
|
isPayment bool
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewApp(dispPort *serial.Port, lockType, encoderAddress string, isPayment bool) *App {
|
||||||
|
return &App{
|
||||||
|
isPayment: isPayment,
|
||||||
|
dispPort: dispPort,
|
||||||
|
lockserver: lockserver.NewLockServer(lockType, encoderAddress, FatalError),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (app *App) RegisterRoutes(mux *http.ServeMux) {
|
||||||
|
mux.HandleFunc("/issuedoorcard", app.issueDoorCard)
|
||||||
|
mux.HandleFunc("/printroomticket", app.printRoomTicket)
|
||||||
|
mux.HandleFunc("/starttransaction", app.startTransaction)
|
||||||
|
mux.HandleFunc("/startandconfirmtransaction", app.startAndConfirmTransaction)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (app *App) startTransaction(w http.ResponseWriter, r *http.Request) {
|
||||||
|
const op = logging.Op("startTransaction")
|
||||||
|
var (
|
||||||
|
theResponse cmstypes.ResponseRec
|
||||||
|
cardholderReceipt string
|
||||||
|
theRequest cmstypes.TransactionRec
|
||||||
|
trResult payment.TransactionResultXML
|
||||||
|
)
|
||||||
|
|
||||||
|
theResponse.Status.Code = http.StatusInternalServerError
|
||||||
|
theResponse.Status.Message = "500 Internal server error"
|
||||||
|
|
||||||
|
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||||
|
w.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS")
|
||||||
|
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
|
||||||
|
if !app.isPayment {
|
||||||
|
theResponse.Data = payment.BuildFailureURL(payment.ResultError, "Payment processing is disabled")
|
||||||
|
writeTransactionResult(w, http.StatusServiceUnavailable, theResponse)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if r.Method == http.MethodOptions {
|
||||||
|
w.WriteHeader(http.StatusNoContent)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Println("startTransaction called")
|
||||||
|
if r.Method != http.MethodPost {
|
||||||
|
theResponse.Data = payment.BuildFailureURL(payment.ResultError, "Method not allowed; use POST")
|
||||||
|
writeTransactionResult(w, http.StatusMethodNotAllowed, theResponse)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer r.Body.Close()
|
||||||
|
|
||||||
|
if ct := r.Header.Get("Content-Type"); ct != "text/xml" {
|
||||||
|
theResponse.Data = payment.BuildFailureURL(payment.ResultError, "Content-Type must be text/xml")
|
||||||
|
writeTransactionResult(w, http.StatusUnsupportedMediaType, theResponse)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
body, _ := io.ReadAll(r.Body)
|
||||||
|
err := xml.Unmarshal(body, &theRequest)
|
||||||
|
if err != nil {
|
||||||
|
logging.Error(serviceName, err.Error(), "ReadXML", string(op), "", "", 0)
|
||||||
|
theResponse.Data = payment.BuildFailureURL(payment.ResultError, "Invalid XML payload")
|
||||||
|
writeTransactionResult(w, http.StatusBadRequest, theResponse)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
log.Printf("Transaction payload: Amount=%s, Type=%s", theRequest.AmountMinorUnits, theRequest.TransactionType)
|
||||||
|
|
||||||
|
client := &http.Client{Timeout: 300 * time.Second}
|
||||||
|
response, err := client.Post(transactionUrl, "text/xml", bytes.NewBuffer(body))
|
||||||
|
if err != nil {
|
||||||
|
logging.Error(serviceName, err.Error(), "Payment processing error", string(op), "", "", 0)
|
||||||
|
theResponse.Data = payment.BuildFailureURL(payment.ResultError, "No response from payment processor")
|
||||||
|
writeTransactionResult(w, http.StatusBadGateway, theResponse)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer response.Body.Close()
|
||||||
|
|
||||||
|
body, err = io.ReadAll(response.Body)
|
||||||
|
if err != nil {
|
||||||
|
logging.Error(serviceName, err.Error(), "Read response body error", string(op), "", "", 0)
|
||||||
|
theResponse.Data = payment.BuildFailureURL(payment.ResultError, "Failed to read response body")
|
||||||
|
writeTransactionResult(w, http.StatusInternalServerError, theResponse)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := trResult.ParseTransactionResult(body); err != nil {
|
||||||
|
logging.Error(serviceName, err.Error(), "Parse transaction result error", string(op), "", "", 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Compose JSON from responseEntries
|
||||||
|
result := make(map[string]string)
|
||||||
|
for _, e := range trResult.Entries {
|
||||||
|
switch e.Key {
|
||||||
|
case payment.ReceiptData, payment.ReceiptDataMerchant:
|
||||||
|
// ignore these
|
||||||
|
case payment.ReceiptDataCardholder:
|
||||||
|
cardholderReceipt = e.Value
|
||||||
|
case payment.TransactionResult:
|
||||||
|
theResponse.Status.Message = e.Value
|
||||||
|
theResponse.Status.Code = http.StatusOK
|
||||||
|
result[e.Key] = e.Value
|
||||||
|
default:
|
||||||
|
result[e.Key] = e.Value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := printer.PrintCardholderReceipt(cardholderReceipt); err != nil {
|
||||||
|
log.Errorf("PrintCardholderReceipt error: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
theResponse.Data = payment.BuildPaymentRedirectURL(result)
|
||||||
|
writeTransactionResult(w, http.StatusOK, theResponse)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (app *App) startAndConfirmTransaction(w http.ResponseWriter, r *http.Request) {
|
||||||
|
const op = logging.Op("startAndConfirmTransaction")
|
||||||
|
var (
|
||||||
|
theResponse cmstypes.ResponseRec
|
||||||
|
cardholderReceipt string
|
||||||
|
theRequest cmstypes.TransactionRec
|
||||||
|
trResult payment.TransactionResultXML
|
||||||
|
)
|
||||||
|
|
||||||
|
theResponse.Status.Code = http.StatusInternalServerError
|
||||||
|
theResponse.Status.Message = "500 Internal server error"
|
||||||
|
|
||||||
|
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||||
|
w.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS")
|
||||||
|
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
|
||||||
|
if !app.isPayment {
|
||||||
|
theResponse.Data = payment.BuildFailureURL(payment.ResultError, "Payment processing is disabled")
|
||||||
|
writeTransactionResult(w, http.StatusServiceUnavailable, theResponse)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if r.Method == http.MethodOptions {
|
||||||
|
w.WriteHeader(http.StatusNoContent)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Println("startAndConfirmTransaction called")
|
||||||
|
if r.Method != http.MethodPost {
|
||||||
|
theResponse.Data = payment.BuildFailureURL(payment.ResultError, "Method not allowed; use POST")
|
||||||
|
writeTransactionResult(w, http.StatusMethodNotAllowed, theResponse)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer r.Body.Close()
|
||||||
|
|
||||||
|
if ct := r.Header.Get("Content-Type"); ct != "text/xml" {
|
||||||
|
theResponse.Data = payment.BuildFailureURL(payment.ResultError, "Content-Type must be text/xml")
|
||||||
|
writeTransactionResult(w, http.StatusUnsupportedMediaType, theResponse)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
body, _ := io.ReadAll(r.Body)
|
||||||
|
err := xml.Unmarshal(body, &theRequest)
|
||||||
|
if err != nil {
|
||||||
|
logging.Error(serviceName, err.Error(), "ReadXML", string(op), "", "", 0)
|
||||||
|
theResponse.Data = payment.BuildFailureURL(payment.ResultError, "Invalid XML payload")
|
||||||
|
writeTransactionResult(w, http.StatusBadRequest, theResponse)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
log.Printf("Transaction payload: Amount=%s, Type=%s", theRequest.AmountMinorUnits, theRequest.TransactionType)
|
||||||
|
|
||||||
|
client := &http.Client{Timeout: 300 * time.Second}
|
||||||
|
response, err := client.Post(transactionUrl, "text/xml", bytes.NewBuffer(body))
|
||||||
|
if err != nil {
|
||||||
|
logging.Error(serviceName, err.Error(), "Payment processing error", string(op), "", "", 0)
|
||||||
|
theResponse.Data = payment.BuildFailureURL(payment.ResultError, "No response from payment processor")
|
||||||
|
writeTransactionResult(w, http.StatusBadGateway, theResponse)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer response.Body.Close()
|
||||||
|
|
||||||
|
body, err = io.ReadAll(response.Body)
|
||||||
|
if err != nil {
|
||||||
|
logging.Error(serviceName, err.Error(), "Read response body error", string(op), "", "", 0)
|
||||||
|
theResponse.Data = payment.BuildFailureURL(payment.ResultError, "Failed to read response body")
|
||||||
|
writeTransactionResult(w, http.StatusInternalServerError, theResponse)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := trResult.ParseTransactionResult(body); err != nil {
|
||||||
|
logging.Error(serviceName, err.Error(), "Parse transaction result error", string(op), "", "", 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Compose JSON from responseEntries
|
||||||
|
result := make(map[string]string)
|
||||||
|
for _, e := range trResult.Entries {
|
||||||
|
switch e.Key {
|
||||||
|
case payment.ReceiptData, payment.ReceiptDataMerchant:
|
||||||
|
// ignore these
|
||||||
|
case payment.ReceiptDataCardholder:
|
||||||
|
cardholderReceipt = e.Value
|
||||||
|
case payment.TransactionResult:
|
||||||
|
theResponse.Status.Message = e.Value
|
||||||
|
theResponse.Status.Code = http.StatusOK
|
||||||
|
result[e.Key] = e.Value
|
||||||
|
default:
|
||||||
|
result[e.Key] = e.Value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := printer.PrintCardholderReceipt(cardholderReceipt); err != nil {
|
||||||
|
log.Errorf("PrintCardholderReceipt error: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
theResponse.Data = payment.BuildRedirectURL(result)
|
||||||
|
writeTransactionResult(w, http.StatusOK, theResponse)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (app *App) issueDoorCard(w http.ResponseWriter, r *http.Request) {
|
||||||
|
const op = logging.Op("issueDoorCard")
|
||||||
|
var (
|
||||||
|
doorReq lockserver.DoorCardRequest
|
||||||
|
theResponse cmstypes.StatusRec
|
||||||
|
)
|
||||||
|
|
||||||
|
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||||
|
w.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS")
|
||||||
|
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
|
||||||
|
if r.Method == http.MethodOptions {
|
||||||
|
w.WriteHeader(http.StatusNoContent)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Println("issueDoorCard called")
|
||||||
|
if r.Method != http.MethodPost {
|
||||||
|
writeError(w, http.StatusMethodNotAllowed, "Method not allowed; use POST")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer r.Body.Close()
|
||||||
|
|
||||||
|
if ct := r.Header.Get("Content-Type"); ct != "application/json" {
|
||||||
|
writeError(w, http.StatusUnsupportedMediaType, "Content-Type must be application/json")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := json.NewDecoder(r.Body).Decode(&doorReq); err != nil {
|
||||||
|
logging.Error(serviceName, err.Error(), "ReadJSON", string(op), "", "", 0)
|
||||||
|
writeError(w, http.StatusBadRequest, "Invalid JSON payload: "+err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// parse times
|
||||||
|
checkIn, err := time.Parse(customLayout, doorReq.CheckinTime)
|
||||||
|
if err != nil {
|
||||||
|
logging.Error(serviceName, err.Error(), "Invalid checkinTime format", string(op), "", "", 0)
|
||||||
|
writeError(w, http.StatusBadRequest, "Invalid checkinTime format: "+err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
checkOut, err := time.Parse(customLayout, doorReq.CheckoutTime)
|
||||||
|
if err != nil {
|
||||||
|
logging.Error(serviceName, err.Error(), "Invalid checkoutTime format", string(op), "", "", 0)
|
||||||
|
writeError(w, http.StatusBadRequest, "Invalid checkoutTime format: "+err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// dispenser sequence
|
||||||
|
if status, err := dispenser.DispenserSequence(app.dispPort); err != nil {
|
||||||
|
if status != "" {
|
||||||
|
logging.Error(serviceName, status, "Dispense error", string(op), "", "", 0)
|
||||||
|
writeError(w, http.StatusServiceUnavailable, "Dispense error: "+err.Error())
|
||||||
|
} else {
|
||||||
|
logging.Error(serviceName, err.Error(), "Dispense error", string(op), "", "", 0)
|
||||||
|
writeError(w, http.StatusServiceUnavailable, "Dispense error: "+err.Error()+"; check card stock")
|
||||||
|
}
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
log.Info(status)
|
||||||
|
}
|
||||||
|
|
||||||
|
// build lock server command
|
||||||
|
app.lockserver.BuildCommand(doorReq, checkIn, checkOut)
|
||||||
|
|
||||||
|
// lock server sequence
|
||||||
|
err = app.lockserver.LockSequence()
|
||||||
|
if err != nil {
|
||||||
|
logging.Error(serviceName, err.Error(), "Key encoding", string(op), "", "", 0)
|
||||||
|
writeError(w, http.StatusBadGateway, err.Error())
|
||||||
|
dispenser.CardOutOfMouth(app.dispPort)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// final dispenser steps
|
||||||
|
if status, err := dispenser.CardOutOfMouth(app.dispPort); err != nil {
|
||||||
|
logging.Error(serviceName, err.Error(), "Dispenser eject error", string(op), "", "", 0)
|
||||||
|
writeError(w, http.StatusServiceUnavailable, "Dispenser eject error: "+err.Error())
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
log.Info(status)
|
||||||
|
}
|
||||||
|
|
||||||
|
theResponse.Code = http.StatusOK
|
||||||
|
theResponse.Message = "Card issued successfully"
|
||||||
|
// success! return 200 and any data you like
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
json.NewEncoder(w).Encode(theResponse)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (app *App) printRoomTicket(w http.ResponseWriter, r *http.Request) {
|
||||||
|
const op = logging.Op("printRoomTicket")
|
||||||
|
var roomDetails printer.RoomDetailsRec
|
||||||
|
// Allow CORS preflight if needed
|
||||||
|
w.Header().Set("Access-Control-Allow-Origin", "*")
|
||||||
|
w.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS")
|
||||||
|
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
||||||
|
|
||||||
|
if r.Method == http.MethodOptions {
|
||||||
|
w.WriteHeader(http.StatusNoContent)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
log.Println("printRoomTicket called")
|
||||||
|
if r.Method != http.MethodPost {
|
||||||
|
writeError(w, http.StatusMethodNotAllowed, "Method not allowed; use POST")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if ct := r.Header.Get("Content-Type"); !strings.Contains(ct, "xml") {
|
||||||
|
writeError(w, http.StatusUnsupportedMediaType, "Content-Type must be application/xml")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
defer r.Body.Close()
|
||||||
|
if err := xml.NewDecoder(r.Body).Decode(&roomDetails); err != nil {
|
||||||
|
logging.Error(serviceName, err.Error(), "ReadXML", string(op), "", "", 0)
|
||||||
|
writeError(w, http.StatusBadRequest, "Invalid XML payload: "+err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := printer.BuildRoomTicket(roomDetails)
|
||||||
|
if err != nil {
|
||||||
|
logging.Error(serviceName, err.Error(), "BuildRoomTicket", string(op), "", "", 0)
|
||||||
|
writeError(w, http.StatusInternalServerError, "BuildRoomTicket failed: "+err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Send to the Windows Epson TM-T82II via the printer package
|
||||||
|
if err := printer.SendToPrinter(data); err != nil {
|
||||||
|
logging.Error(serviceName, err.Error(), "printRoomTicket", "printRoomTicket", "", "", 0)
|
||||||
|
writeError(w, http.StatusInternalServerError, "Print failed: "+err.Error())
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Success
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.WriteHeader(http.StatusOK)
|
||||||
|
json.NewEncoder(w).Encode(cmstypes.StatusRec{
|
||||||
|
Code: http.StatusOK,
|
||||||
|
Message: "Print job sent successfully",
|
||||||
|
})
|
||||||
|
}
|
||||||
@@ -0,0 +1,41 @@
|
|||||||
|
package handlers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"gitea.futuresens.co.uk/futuresens/cmstypes"
|
||||||
|
"gitea.futuresens.co.uk/futuresens/logging"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
const serviceName = "hardlink"
|
||||||
|
|
||||||
|
// writeError is a helper to send a JSON error and HTTP status in one go.
|
||||||
|
func writeError(w http.ResponseWriter, status int, msg string) {
|
||||||
|
theResponse := cmstypes.StatusRec{
|
||||||
|
Code: status,
|
||||||
|
Message: msg,
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.WriteHeader(status)
|
||||||
|
json.NewEncoder(w).Encode(theResponse)
|
||||||
|
}
|
||||||
|
|
||||||
|
func writeTransactionResult(w http.ResponseWriter, status int, theResponse cmstypes.ResponseRec) {
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.WriteHeader(status)
|
||||||
|
if err := json.NewEncoder(w).Encode(theResponse); err != nil {
|
||||||
|
logging.Error(serviceName, err.Error(), "JSON encode error", "startTransaction", "", "", 0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func FatalError(err error) {
|
||||||
|
fmt.Println(err.Error())
|
||||||
|
log.Errorf(err.Error())
|
||||||
|
fmt.Println(". Press Enter to exit...")
|
||||||
|
fmt.Scanln()
|
||||||
|
os.Exit(1)
|
||||||
|
}
|
||||||
@@ -22,7 +22,7 @@ func (lock *AssaLockServer) BuildCommand(doorReq DoorCardRequest, checkIn, check
|
|||||||
func (lock *AssaLockServer) LockSequence() error {
|
func (lock *AssaLockServer) LockSequence() error {
|
||||||
const funcName = "AssaLockServer.LockSequence"
|
const funcName = "AssaLockServer.LockSequence"
|
||||||
|
|
||||||
conn, err := InitializeServerConnection(lock.encoderAddr)
|
conn, err := InitializeServerConnection(LockServerURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ func (lock *OmniLockServer) BuildCommand(doorReq DoorCardRequest, checkIn, check
|
|||||||
func (lock *OmniLockServer) LockSequence() error {
|
func (lock *OmniLockServer) LockSequence() error {
|
||||||
const funcName = "OmniLockServer.LockSequence"
|
const funcName = "OmniLockServer.LockSequence"
|
||||||
|
|
||||||
conn, err := net.Dial("tcp", lock.encoderAddr)
|
conn, err := InitializeServerConnection(LockServerURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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,19 +140,19 @@ 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
|
||||||
)
|
)
|
||||||
|
|
||||||
conn, err := InitializeServerConnection(lock.encoderAddr)
|
conn, err := InitializeServerConnection(LockServerURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
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))
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ func (lock *TLJLockServer) BuildCommand(doorReq DoorCardRequest, checkIn, checkO
|
|||||||
|
|
||||||
func (lock *TLJLockServer) LockSequence() error {
|
func (lock *TLJLockServer) LockSequence() error {
|
||||||
log.Infof("Sending command: %q", lock.command)
|
log.Infof("Sending command: %q", lock.command)
|
||||||
client := &http.Client{Timeout: 10 * time.Second}
|
client := &http.Client{Timeout: 30 * time.Second}
|
||||||
resp, err := client.Get(lock.command)
|
resp, err := client.Get(lock.command)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("HTTP request failed: %v", err)
|
return fmt.Errorf("HTTP request failed: %v", err)
|
||||||
|
|||||||
@@ -1,11 +1,8 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
// "database/sql"
|
|
||||||
"encoding/json"
|
|
||||||
"encoding/xml"
|
"encoding/xml"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
@@ -20,19 +17,14 @@ import (
|
|||||||
yaml "gopkg.in/yaml.v3"
|
yaml "gopkg.in/yaml.v3"
|
||||||
|
|
||||||
"gitea.futuresens.co.uk/futuresens/hardlink/dispenser"
|
"gitea.futuresens.co.uk/futuresens/hardlink/dispenser"
|
||||||
|
"gitea.futuresens.co.uk/futuresens/hardlink/handlers"
|
||||||
"gitea.futuresens.co.uk/futuresens/hardlink/lockserver"
|
"gitea.futuresens.co.uk/futuresens/hardlink/lockserver"
|
||||||
"gitea.futuresens.co.uk/futuresens/hardlink/payment"
|
|
||||||
"gitea.futuresens.co.uk/futuresens/hardlink/printer"
|
"gitea.futuresens.co.uk/futuresens/hardlink/printer"
|
||||||
|
|
||||||
"gitea.futuresens.co.uk/futuresens/cmstypes"
|
|
||||||
"gitea.futuresens.co.uk/futuresens/logging"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
buildVersion = "1.0.13"
|
buildVersion = "1.0.24"
|
||||||
serviceName = "hardlink"
|
serviceName = "hardlink"
|
||||||
customLayout = "2006-01-02 15:04:05 -0700"
|
|
||||||
transactionUrl = "http://127.0.0.1:18181/start-transaction/"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// configRec holds values from config.yml.
|
// configRec holds values from config.yml.
|
||||||
@@ -47,19 +39,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.
|
|
||||||
type App struct {
|
|
||||||
dispPort *serial.Port
|
|
||||||
lockserver lockserver.LockServer
|
|
||||||
}
|
|
||||||
|
|
||||||
func newApp(dispPort *serial.Port, config configRec) *App {
|
|
||||||
return &App{
|
|
||||||
dispPort: dispPort,
|
|
||||||
lockserver: lockserver.NewLockServer(config.LockType, config.EncoderAddress, fatalError),
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
@@ -69,6 +49,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)
|
||||||
@@ -78,25 +59,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 {
|
||||||
}
|
handlers.FatalError(err)
|
||||||
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())
|
|
||||||
}
|
}
|
||||||
|
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)
|
||||||
|
handlers.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) {
|
||||||
@@ -105,98 +88,38 @@ 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 := handlers.NewApp(dispHandle, config.LockType, config.EncoderAddress, config.IsPayment)
|
||||||
app := newApp(dispHandle, config)
|
|
||||||
|
|
||||||
mux := http.NewServeMux()
|
mux := http.NewServeMux()
|
||||||
setUpRoutes(app, mux)
|
app.RegisterRoutes(mux)
|
||||||
|
|
||||||
addr := fmt.Sprintf(":%d", config.Port)
|
addr := fmt.Sprintf(":%d", config.Port)
|
||||||
log.Infof("Starting HTTP server on http://localhost%s", addr)
|
log.Infof("Starting HTTP server on http://localhost%s", addr)
|
||||||
fmt.Printf("Starting HTTP server on http://localhost%s", addr)
|
fmt.Printf("Starting HTTP server on http://localhost%s", addr)
|
||||||
if err := http.ListenAndServe(addr, mux); err != nil {
|
if err := http.ListenAndServe(addr, mux); err != nil {
|
||||||
fatalError(err)
|
handlers.FatalError(err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func setUpRoutes(app *App, mux *http.ServeMux) {
|
|
||||||
mux.HandleFunc("/issuedoorcard", app.issueDoorCard)
|
|
||||||
mux.HandleFunc("/printroomticket", app.printRoomTicket)
|
|
||||||
mux.HandleFunc("/starttransaction", app.startTransaction)
|
|
||||||
}
|
|
||||||
|
|
||||||
func fatalError(err error) {
|
|
||||||
fmt.Println(err.Error())
|
|
||||||
log.Errorf(err.Error())
|
|
||||||
fmt.Println(". Press Enter to exit...")
|
|
||||||
fmt.Scanln()
|
|
||||||
os.Exit(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
// setupLogging ensures log directory, opens log file, and configures logrus.
|
// setupLogging ensures log directory, opens log file, and configures logrus.
|
||||||
// Returns the *os.File so caller can defer its Close().
|
// Returns the *os.File so caller can defer its Close().
|
||||||
func setupLogging(logDir string) (*os.File, error) {
|
func setupLogging(logDir string) (*os.File, error) {
|
||||||
@@ -219,242 +142,6 @@ func setupLogging(logDir string) (*os.File, error) {
|
|||||||
return f, nil
|
return f, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// writeError is a helper to send a JSON error and HTTP status in one go.
|
|
||||||
func writeError(w http.ResponseWriter, status int, msg string) {
|
|
||||||
theResponse := cmstypes.StatusRec{
|
|
||||||
Code: status,
|
|
||||||
Message: msg,
|
|
||||||
}
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
w.WriteHeader(status)
|
|
||||||
json.NewEncoder(w).Encode(theResponse)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (app *App) startTransaction(w http.ResponseWriter, r *http.Request) {
|
|
||||||
const op = logging.Op("startTransaction")
|
|
||||||
var (
|
|
||||||
theResponse cmstypes.ResponseRec
|
|
||||||
cardholderReceipt string
|
|
||||||
)
|
|
||||||
|
|
||||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
|
||||||
w.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS")
|
|
||||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
|
|
||||||
if r.Method == http.MethodOptions {
|
|
||||||
w.WriteHeader(http.StatusNoContent)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
log.Println("startTransaction called")
|
|
||||||
if r.Method != http.MethodPost {
|
|
||||||
writeError(w, http.StatusMethodNotAllowed, "Method not allowed; use POST")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer r.Body.Close()
|
|
||||||
|
|
||||||
if ct := r.Header.Get("Content-Type"); ct != "text/xml" {
|
|
||||||
writeError(w, http.StatusUnsupportedMediaType, "Content-Type must be text/xml")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
client := &http.Client{Timeout: 90 * time.Second}
|
|
||||||
response, err := client.Post(transactionUrl, "text/xml", r.Body)
|
|
||||||
if err != nil {
|
|
||||||
logging.Error(serviceName, err.Error(), "Payment processing error", string(op), "", "", 0)
|
|
||||||
writeError(w, http.StatusInternalServerError, "Payment processing failed: "+err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer response.Body.Close()
|
|
||||||
|
|
||||||
body, err := io.ReadAll(response.Body)
|
|
||||||
if err != nil {
|
|
||||||
logging.Error(serviceName, err.Error(), "Read response body error", string(op), "", "", 0)
|
|
||||||
writeError(w, http.StatusInternalServerError, "Failed to read response body: "+err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
responseEntries, _ := payment.ParseTransactionResult(body)
|
|
||||||
|
|
||||||
// Compose JSON from responseEntries
|
|
||||||
result := make(map[string]string)
|
|
||||||
for _, e := range responseEntries {
|
|
||||||
switch e.Key {
|
|
||||||
case "RECEIPT_DATA", "RECEIPT_DATA_MERCHANT":
|
|
||||||
case "RECEIPT_DATA_CARDHOLDER":
|
|
||||||
cardholderReceipt = e.Value
|
|
||||||
case "TRANSACTION_RESULT":
|
|
||||||
theResponse.Status.Message = e.Value
|
|
||||||
theResponse.Status.Code = http.StatusOK
|
|
||||||
result[e.Key] = e.Value
|
|
||||||
default:
|
|
||||||
result[e.Key] = e.Value
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := printer.PrintCardholderReceipt(cardholderReceipt); err != nil {
|
|
||||||
log.Errorf("PrintCardholderReceipt error: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Insert into DB
|
|
||||||
// if err := payment.InsertTransactionRecord(r.Context(), app.db, result); err != nil {
|
|
||||||
// log.Errorf("DB insert error: %v", err)
|
|
||||||
// }
|
|
||||||
|
|
||||||
theResponse.Data = payment.BuildRedirectURL(result)
|
|
||||||
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
if err := json.NewEncoder(w).Encode(theResponse); err != nil {
|
|
||||||
logging.Error(serviceName, err.Error(), "JSON encode error", string(op), "", "", 0)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func (app *App) issueDoorCard(w http.ResponseWriter, r *http.Request) {
|
|
||||||
const op = logging.Op("issueDoorCard")
|
|
||||||
var (
|
|
||||||
doorReq lockserver.DoorCardRequest
|
|
||||||
theResponse cmstypes.StatusRec
|
|
||||||
)
|
|
||||||
|
|
||||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
|
||||||
w.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS")
|
|
||||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
|
|
||||||
if r.Method == http.MethodOptions {
|
|
||||||
w.WriteHeader(http.StatusNoContent)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
log.Println("issueDoorCard called")
|
|
||||||
if r.Method != http.MethodPost {
|
|
||||||
writeError(w, http.StatusMethodNotAllowed, "Method not allowed; use POST")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
defer r.Body.Close()
|
|
||||||
|
|
||||||
if ct := r.Header.Get("Content-Type"); ct != "application/json" {
|
|
||||||
writeError(w, http.StatusUnsupportedMediaType, "Content-Type must be application/json")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := json.NewDecoder(r.Body).Decode(&doorReq); err != nil {
|
|
||||||
logging.Error(serviceName, err.Error(), "ReadJSON", string(op), "", "", 0)
|
|
||||||
writeError(w, http.StatusBadRequest, "Invalid JSON payload: "+err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// parse times
|
|
||||||
checkIn, err := time.Parse(customLayout, doorReq.CheckinTime)
|
|
||||||
if err != nil {
|
|
||||||
logging.Error(serviceName, err.Error(), "Invalid checkinTime format", string(op), "", "", 0)
|
|
||||||
writeError(w, http.StatusBadRequest, "Invalid checkinTime format: "+err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
checkOut, err := time.Parse(customLayout, doorReq.CheckoutTime)
|
|
||||||
if err != nil {
|
|
||||||
logging.Error(serviceName, err.Error(), "Invalid checkoutTime format", string(op), "", "", 0)
|
|
||||||
writeError(w, http.StatusBadRequest, "Invalid checkoutTime format: "+err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// dispenser sequence
|
|
||||||
if status, err := dispenser.DispenserSequence(app.dispPort); err != nil {
|
|
||||||
if status != "" {
|
|
||||||
logging.Error(serviceName, status, "Dispense error", string(op), "", "", 0)
|
|
||||||
writeError(w, http.StatusServiceUnavailable, "Dispense error: "+err.Error())
|
|
||||||
} else {
|
|
||||||
logging.Error(serviceName, err.Error(), "Dispense error", string(op), "", "", 0)
|
|
||||||
writeError(w, http.StatusServiceUnavailable, "Dispense error: "+err.Error()+"; check card stock")
|
|
||||||
}
|
|
||||||
return
|
|
||||||
} else {
|
|
||||||
log.Info(status)
|
|
||||||
}
|
|
||||||
|
|
||||||
// build lock server command
|
|
||||||
app.lockserver.BuildCommand(doorReq, checkIn, checkOut)
|
|
||||||
|
|
||||||
// lock server sequence
|
|
||||||
err = app.lockserver.LockSequence()
|
|
||||||
if err != nil {
|
|
||||||
logging.Error(serviceName, err.Error(), "Key encoding", string(op), "", "", 0)
|
|
||||||
writeError(w, http.StatusBadGateway, err.Error())
|
|
||||||
dispenser.CardOutOfMouth(app.dispPort)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// final dispenser steps
|
|
||||||
if status, err := dispenser.CardOutOfMouth(app.dispPort); err != nil {
|
|
||||||
logging.Error(serviceName, err.Error(), "Dispenser eject error", string(op), "", "", 0)
|
|
||||||
writeError(w, http.StatusServiceUnavailable, "Dispenser eject error: "+err.Error())
|
|
||||||
return
|
|
||||||
} else {
|
|
||||||
log.Info(status)
|
|
||||||
}
|
|
||||||
|
|
||||||
theResponse.Code = http.StatusOK
|
|
||||||
theResponse.Message = "Card issued successfully"
|
|
||||||
// success! return 200 and any data you like
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
json.NewEncoder(w).Encode(theResponse)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (app *App) printRoomTicket(w http.ResponseWriter, r *http.Request) {
|
|
||||||
const op = logging.Op("printRoomTicket")
|
|
||||||
var roomDetails printer.RoomDetailsRec
|
|
||||||
// Allow CORS preflight if needed
|
|
||||||
w.Header().Set("Access-Control-Allow-Origin", "*")
|
|
||||||
w.Header().Set("Access-Control-Allow-Methods", "POST, OPTIONS")
|
|
||||||
w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
|
|
||||||
|
|
||||||
if r.Method == http.MethodOptions {
|
|
||||||
w.WriteHeader(http.StatusNoContent)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
log.Println("printRoomTicket called")
|
|
||||||
if r.Method != http.MethodPost {
|
|
||||||
writeError(w, http.StatusMethodNotAllowed, "Method not allowed; use POST")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if ct := r.Header.Get("Content-Type"); !strings.Contains(ct, "xml") {
|
|
||||||
writeError(w, http.StatusUnsupportedMediaType, "Content-Type must be application/xml")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
defer r.Body.Close()
|
|
||||||
if err := xml.NewDecoder(r.Body).Decode(&roomDetails); err != nil {
|
|
||||||
logging.Error(serviceName, err.Error(), "ReadXML", string(op), "", "", 0)
|
|
||||||
writeError(w, http.StatusBadRequest, "Invalid XML payload: "+err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
data, err := printer.BuildRoomTicket(roomDetails)
|
|
||||||
if err != nil {
|
|
||||||
logging.Error(serviceName, err.Error(), "BuildRoomTicket", string(op), "", "", 0)
|
|
||||||
writeError(w, http.StatusInternalServerError, "BuildRoomTicket failed: "+err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Send to the Windows Epson TM-T82II via the printer package
|
|
||||||
if err := printer.SendToPrinter(data); err != nil {
|
|
||||||
logging.Error(serviceName, err.Error(), "printRoomTicket", "printRoomTicket", "", "", 0)
|
|
||||||
writeError(w, http.StatusInternalServerError, "Print failed: "+err.Error())
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Success
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
w.WriteHeader(http.StatusOK)
|
|
||||||
json.NewEncoder(w).Encode(cmstypes.StatusRec{
|
|
||||||
Code: http.StatusOK,
|
|
||||||
Message: "Print job sent successfully",
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// readConfig reads config.yml and applies defaults.
|
// readConfig reads config.yml and applies defaults.
|
||||||
func readConfig() configRec {
|
func readConfig() configRec {
|
||||||
var cfg configRec
|
var cfg configRec
|
||||||
@@ -475,7 +162,7 @@ func readConfig() configRec {
|
|||||||
|
|
||||||
if cfg.LockType == "" {
|
if cfg.LockType == "" {
|
||||||
err = fmt.Errorf("LockType is required in %s", configName)
|
err = fmt.Errorf("LockType is required in %s", configName)
|
||||||
fatalError(err)
|
handlers.FatalError(err)
|
||||||
}
|
}
|
||||||
cfg.LockType = strings.ToLower(cfg.LockType)
|
cfg.LockType = strings.ToLower(cfg.LockType)
|
||||||
|
|
||||||
@@ -494,13 +181,70 @@ func readTicketLayout() printer.LayoutOptions {
|
|||||||
// 1) Read the file
|
// 1) Read the file
|
||||||
data, err := os.ReadFile(layoutName)
|
data, err := os.ReadFile(layoutName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fatalError(fmt.Errorf("failed to read %s: %v", layoutName, err))
|
handlers.FatalError(fmt.Errorf("failed to read %s: %v", layoutName, err))
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2) Unmarshal into your struct
|
// 2) Unmarshal into your struct
|
||||||
if err := xml.Unmarshal(data, &layout); err != nil {
|
if err := xml.Unmarshal(data, &layout); err != nil {
|
||||||
fatalError(fmt.Errorf("failed to parse %s: %v", layoutName, err))
|
handlers.FatalError(fmt.Errorf("failed to parse %s: %v", layoutName, err))
|
||||||
}
|
}
|
||||||
|
|
||||||
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 {
|
||||||
|
handlers.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)
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|||||||
+120
-57
@@ -16,6 +16,11 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
// Transaction types
|
||||||
|
SaleTransactionType = "sale"
|
||||||
|
AccountVerificationType = "account verification"
|
||||||
|
|
||||||
|
// Transaction results
|
||||||
ResultApproved = "approved"
|
ResultApproved = "approved"
|
||||||
ResultDeclined = "declined"
|
ResultDeclined = "declined"
|
||||||
ResultCancelled = "cancelled"
|
ResultCancelled = "cancelled"
|
||||||
@@ -23,6 +28,24 @@ const (
|
|||||||
ResultError = "error"
|
ResultError = "error"
|
||||||
CheckinSuccessfulEndpoint = "/successful" // Endpoint to send guest to after successful payment
|
CheckinSuccessfulEndpoint = "/successful" // Endpoint to send guest to after successful payment
|
||||||
CheckinUnsuccessfulEndpoint = "/unsuccessful"
|
CheckinUnsuccessfulEndpoint = "/unsuccessful"
|
||||||
|
|
||||||
|
// Response map keys
|
||||||
|
CardReference = "CARD_REFERENCE"
|
||||||
|
CardHash = "CARD_HASH"
|
||||||
|
Errors = "ERRORS"
|
||||||
|
ReceiptData = "RECEIPT_DATA"
|
||||||
|
ReceiptDataMerchant = "RECEIPT_DATA_MERCHANT"
|
||||||
|
ReceiptDataCardholder = "RECEIPT_DATA_CARDHOLDER"
|
||||||
|
Reference = "REFERENCE"
|
||||||
|
TransactionResult = "TRANSACTION_RESULT"
|
||||||
|
TransactionType = "TRANSACTION_TYPE"
|
||||||
|
ConfirmResult = "CONFIRM_RESULT"
|
||||||
|
ConfirmErrors = "CONFIRM_ERRORS"
|
||||||
|
|
||||||
|
// Log field keys
|
||||||
|
LogFieldError = "error"
|
||||||
|
LogFieldDescription = "description"
|
||||||
|
LogResult = "transactionResult"
|
||||||
)
|
)
|
||||||
|
|
||||||
// XML parsing structs
|
// XML parsing structs
|
||||||
@@ -42,15 +65,22 @@ type (
|
|||||||
Key string `xml:"Key"`
|
Key string `xml:"Key"`
|
||||||
Value string `xml:"Value"`
|
Value string `xml:"Value"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TransactionConfirmation struct {
|
||||||
|
XMLName xml.Name `xml:"TransactionConfirmation"`
|
||||||
|
Result string `xml:"Result"`
|
||||||
|
Errors string `xml:"Errors"`
|
||||||
|
ErrorDescription string `xml:"ErrorDescription"`
|
||||||
|
ReceiptDataCardholder string `xml:"ReceiptDataCardholder"`
|
||||||
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
// ParseTransactionResult parses the XML into entries.
|
// ParseTransactionResult parses the XML into entries.
|
||||||
func ParseTransactionResult(data []byte) ([]EntryXML, error) {
|
func (tr *TransactionResultXML) ParseTransactionResult(data []byte) error {
|
||||||
var tr TransactionResultXML
|
|
||||||
if err := xml.Unmarshal(data, &tr); err != nil {
|
if err := xml.Unmarshal(data, &tr); err != nil {
|
||||||
return nil, fmt.Errorf("XML unmarshal: %w", err)
|
return fmt.Errorf("XML unmarshal: %w", err)
|
||||||
}
|
}
|
||||||
return tr.Entries, nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// initMSSQL opens and pings the SQL Server instance localhost\SQLEXPRESS
|
// initMSSQL opens and pings the SQL Server instance localhost\SQLEXPRESS
|
||||||
@@ -217,65 +247,98 @@ func nullableFloatArg(nf sql.NullFloat64) interface{} {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func BuildRedirectURL(result map[string]string) string {
|
// BuildRedirectURL builds the redirect URL to send the guest to after payment.
|
||||||
// 1) normalize the result code
|
func BuildPaymentRedirectURL(result map[string]string) string {
|
||||||
res := strings.ToLower(result["TRANSACTION_RESULT"])
|
res := result[TransactionResult]
|
||||||
|
tType := result[TransactionType]
|
||||||
|
|
||||||
// 2) pick base path and optional error params
|
// Transaction approved?
|
||||||
var basePath string
|
if strings.EqualFold(res, ResultApproved) {
|
||||||
var msgType, description string
|
switch {
|
||||||
|
// Transaction type AccountVerification?
|
||||||
|
case strings.EqualFold(tType, AccountVerificationType):
|
||||||
|
log.WithField(LogResult, result[TransactionResult]).
|
||||||
|
Info("Account verification approved")
|
||||||
|
|
||||||
switch res {
|
return buildSuccessURL(result)
|
||||||
case ResultApproved:
|
|
||||||
basePath = CheckinSuccessfulEndpoint
|
|
||||||
|
|
||||||
case ResultDeclined:
|
// Transaction type Sale?
|
||||||
basePath = CheckinUnsuccessfulEndpoint
|
case strings.EqualFold(tType, SaleTransactionType):
|
||||||
msgType = "declined"
|
// Transaction confirmed?
|
||||||
description = "payment declined"
|
if strings.EqualFold(result[ConfirmResult], ResultApproved) {
|
||||||
|
log.WithField(LogResult, result[ConfirmResult]).
|
||||||
|
Info("Transaction approved and confirmed")
|
||||||
|
|
||||||
case ResultCancelled:
|
return buildSuccessURL(result)
|
||||||
basePath = CheckinUnsuccessfulEndpoint
|
}
|
||||||
msgType = "cancelled"
|
|
||||||
description = "payment cancelled by customer"
|
|
||||||
|
|
||||||
case ResultPending:
|
// Not confirmed
|
||||||
// you could choose to treat pending as unsuccessful or special-case it
|
log.WithFields(log.Fields{LogFieldError: result[ConfirmResult], LogFieldDescription: result[ConfirmErrors]}).
|
||||||
basePath = CheckinUnsuccessfulEndpoint
|
Error("Transaction approved but not confirmed")
|
||||||
msgType = "pending"
|
|
||||||
description = "payment pending"
|
|
||||||
case ResultError:
|
|
||||||
basePath = CheckinUnsuccessfulEndpoint
|
|
||||||
msgType = "error"
|
|
||||||
description = result["ERROR"]
|
|
||||||
|
|
||||||
default:
|
return BuildFailureURL(result[ConfirmResult], result[ConfirmErrors])
|
||||||
basePath = CheckinUnsuccessfulEndpoint
|
}
|
||||||
msgType = "error"
|
|
||||||
description = "unknown transaction result"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if msgType != "" {
|
// Not approved
|
||||||
log.Warnf("Transaction %s: %s - %s", res, msgType, description)
|
return BuildFailureURL(res, result[Errors])
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3) build query params
|
func BuildPreauthRedirectURL(result map[string]string) string {
|
||||||
q := url.Values{}
|
res := result[TransactionResult]
|
||||||
q.Set("TxnReference", result["REFERENCE"])
|
tType := result[TransactionType]
|
||||||
q.Set("CardHash", hex.EncodeToString([]byte(result["CARD_HASH"])))
|
|
||||||
q.Set("CardReference", hex.EncodeToString([]byte(result["CARD_REFERENCE"])))
|
// Transaction approved?
|
||||||
|
if strings.EqualFold(res, ResultApproved) {
|
||||||
// only append these when non-approved
|
switch {
|
||||||
if msgType != "" {
|
// Transaction type AccountVerification?
|
||||||
q.Set("MsgType", msgType)
|
case strings.EqualFold(tType, AccountVerificationType):
|
||||||
q.Set("Description", description)
|
log.WithField(LogResult, result[TransactionResult]).
|
||||||
}
|
Info("Account verification approved")
|
||||||
|
|
||||||
// 4) assemble final URL
|
return buildSuccessURL(result)
|
||||||
// note: url.URL automatically escapes values in RawQuery
|
|
||||||
u := url.URL{
|
// Transaction type Sale?
|
||||||
Path: basePath,
|
case strings.EqualFold(tType, SaleTransactionType):
|
||||||
RawQuery: q.Encode(),
|
// Transaction confirmed?
|
||||||
}
|
log.WithField(LogResult, result[ConfirmResult]).
|
||||||
return u.String()
|
Info("Transaction approved and confirmed")
|
||||||
|
|
||||||
|
return buildSuccessURL(result)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Not approved
|
||||||
|
return BuildFailureURL(res, result[Errors])
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildSuccessURL(result map[string]string) string {
|
||||||
|
q := url.Values{}
|
||||||
|
q.Set("TxnReference", result[Reference])
|
||||||
|
q.Set("CardHash", hex.EncodeToString([]byte(result[CardHash])))
|
||||||
|
q.Set("CardReference", hex.EncodeToString([]byte(result[CardReference])))
|
||||||
|
return (&url.URL{
|
||||||
|
Path: CheckinSuccessfulEndpoint,
|
||||||
|
RawQuery: q.Encode(),
|
||||||
|
}).String()
|
||||||
|
}
|
||||||
|
|
||||||
|
func BuildFailureURL(msgType, description string) string {
|
||||||
|
q := url.Values{}
|
||||||
|
if msgType != "" {
|
||||||
|
description = fmt.Sprintf("Transaction %s", strings.ToLower(msgType))
|
||||||
|
}
|
||||||
|
if description != "" {
|
||||||
|
msgType = ResultError
|
||||||
|
}
|
||||||
|
|
||||||
|
log.WithFields(log.Fields{LogFieldError: msgType, LogFieldDescription: description}).
|
||||||
|
Error("Transaction failed")
|
||||||
|
|
||||||
|
q.Set("MsgType", msgType)
|
||||||
|
q.Set("Description", description)
|
||||||
|
return (&url.URL{
|
||||||
|
Path: CheckinUnsuccessfulEndpoint,
|
||||||
|
RawQuery: q.Encode(),
|
||||||
|
}).String()
|
||||||
}
|
}
|
||||||
|
|||||||
+42
-12
@@ -2,44 +2,74 @@
|
|||||||
|
|
||||||
builtVersion is a const in main.go
|
builtVersion is a const in main.go
|
||||||
|
|
||||||
|
#### 1.0.24 - 13 November 2025
|
||||||
|
improved logging for creditcall payment processing
|
||||||
|
|
||||||
|
#### 1.0.23 - 13 November 2025
|
||||||
|
moved handlers from main.go to handlers/handlers.go
|
||||||
|
|
||||||
|
#### 1.0.22 - 13 November 2025
|
||||||
|
added test mode into config file to allow testing without connecting to the dispenser
|
||||||
|
|
||||||
|
#### 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
|
||||||
|
increased timeout for TLJ lock server connection to 30 seconds
|
||||||
|
|
||||||
|
#### 1.0.17 - 30 August 2025
|
||||||
|
added functionality to commit transactions
|
||||||
|
|
||||||
|
#### 1.0.15 - 27 August 2025
|
||||||
|
fixed TCP/IP connection to the lock server
|
||||||
|
|
||||||
|
#### 1.0.14 - 21 August 2025
|
||||||
|
fixed issue in creditcall payment processing where error description was not properly set
|
||||||
|
|
||||||
#### 1.0.13 - 21 August 2025
|
#### 1.0.13 - 21 August 2025
|
||||||
TCP/IP connection to the lock server is now established before encoding the keycard and closedafter the encoding is done.
|
TCP/IP connection to the lock server is now established before encoding the keycard and closedafter the encoding is done.
|
||||||
|
|
||||||
#### 1.0.12 - 11 August 2024
|
#### 1.0.12 - 11 August 2025
|
||||||
added delay before checking dispenser status
|
added delay before checking dispenser status
|
||||||
|
|
||||||
#### 1.0.11 - 11 August 2024
|
#### 1.0.11 - 11 August 2025
|
||||||
updated Salto key encoding workflow
|
updated Salto key encoding workflow
|
||||||
|
|
||||||
#### 1.0.10 - 08 August 2024
|
#### 1.0.10 - 08 August 2025
|
||||||
updated logging for TLJ locks
|
updated logging for TLJ locks
|
||||||
|
|
||||||
#### 1.0.9 - 08 August 2024
|
#### 1.0.9 - 08 August 2025
|
||||||
added TLJ lock server and implemented workflow for TLJ locks
|
added TLJ lock server and implemented workflow for TLJ locks
|
||||||
|
|
||||||
#### 1.0.8 - 01 August 2024
|
#### 1.0.8 - 01 August 2025
|
||||||
improved error handling and logging in Salto
|
improved error handling and logging in Salto
|
||||||
|
|
||||||
#### 1.0.7 - 25 July 2024
|
#### 1.0.7 - 25 July 2025
|
||||||
added check if the room exists
|
added check if the room exists
|
||||||
|
|
||||||
#### 1.0.6 - 25 July 2024
|
#### 1.0.6 - 25 July 2025
|
||||||
updated workflow for Salto locks
|
updated workflow for Salto locks
|
||||||
|
|
||||||
#### 1.0.5 - 24 July 2024
|
#### 1.0.5 - 24 July 2025
|
||||||
added encoding keycard copy for Salto locks
|
added encoding keycard copy for Salto locks
|
||||||
|
|
||||||
#### 1.0.4 - 22 July 2024
|
#### 1.0.4 - 22 July 2025
|
||||||
added salto lock server and implemented workflow for Salto
|
added salto lock server and implemented workflow for Salto
|
||||||
|
|
||||||
#### 1.0.0 - 30 June 2024
|
#### 1.0.0 - 30 June 2025
|
||||||
added creditcall payment method
|
added creditcall payment method
|
||||||
`/starttransaction` - API payment endpoint to start a transaction
|
`/starttransaction` - API payment endpoint to start a transaction
|
||||||
|
|
||||||
#### 0.9.1 - 22 May 2024
|
#### 0.9.1 - 22 May 2025
|
||||||
added lockserver interface and implemented workflow for Omnitec
|
added lockserver interface and implemented workflow for Omnitec
|
||||||
|
|
||||||
#### 0.9.0 - 22 May 2024
|
#### 0.9.0 - 22 May 2025
|
||||||
The new API has two new endpoints:
|
The new API has two new endpoints:
|
||||||
- `/issuedoorcard` - encoding the door card for the room.
|
- `/issuedoorcard` - encoding the door card for the room.
|
||||||
- `/printroomticket` - printing the room ticket.
|
- `/printroomticket` - printing the room ticket.
|
||||||
Reference in New Issue
Block a user