Compare commits
35
Commits
0.9.0
...
cardEncoder
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
975707de4c | ||
|
|
7941e2065e | ||
|
|
b59d77a373 | ||
|
|
a4885be458 | ||
|
|
89dfa28e6f | ||
|
|
bb526a248d | ||
|
|
f4f44da541 | ||
|
|
7993a2360d | ||
|
|
c15ceba78f | ||
|
|
04c664294d | ||
|
|
da5cafe031 | ||
|
|
efa415e631 | ||
|
|
f1dc0ccce4 | ||
|
|
1bceb55285 | ||
|
|
bb8cdb1d84 | ||
|
|
251afd6aeb | ||
|
|
e6ff292706 | ||
|
|
b4d16f9021 | ||
|
|
c8f6c57983 | ||
|
|
61b089fe55 | ||
|
|
8b0e7df582 | ||
|
|
25eab0dc75 | ||
|
|
fc91f2c0f2 | ||
|
|
5ce9fdcf0b | ||
|
|
b303721a92 | ||
|
|
dc91a9ae63 | ||
|
|
b303481b5f | ||
|
|
41cf71a253 | ||
|
|
5e99453eeb | ||
|
|
b002c80b01 | ||
|
|
d9871e6a1c | ||
|
|
140c9a44cc | ||
|
|
b200eb3b91 | ||
|
|
7a9aa5ae7a | ||
|
|
fdf6985282 |
@@ -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,18 @@
|
|||||||
|
// internal/bootstrap/db.go
|
||||||
|
package bootstrap
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql"
|
||||||
|
|
||||||
|
"gitea.futuresens.co.uk/futuresens/hardlink/config"
|
||||||
|
"gitea.futuresens.co.uk/futuresens/hardlink/db"
|
||||||
|
)
|
||||||
|
|
||||||
|
func OpenDB(cfg *config.ConfigRec) (*sql.DB, error) {
|
||||||
|
return db.InitMSSQL(
|
||||||
|
cfg.Dbport,
|
||||||
|
cfg.Dbuser,
|
||||||
|
cfg.Dbpassword,
|
||||||
|
cfg.Dbname,
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
package config
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"gitea.futuresens.co.uk/futuresens/hardlink/handlers"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
yaml "gopkg.in/yaml.v3"
|
||||||
|
)
|
||||||
|
|
||||||
|
// configRec holds values from config.yml.
|
||||||
|
type ConfigRec struct {
|
||||||
|
Port int `yaml:"port"`
|
||||||
|
LockserverUrl string `yaml:"lockservUrl"`
|
||||||
|
LockType string `yaml:"lockType"`
|
||||||
|
EncoderAddress string `yaml:"encoderAddr"`
|
||||||
|
Cert string `yaml:"cert"`
|
||||||
|
DispenserPort string `yaml:"dispensPort"`
|
||||||
|
DispenserAdrr string `yaml:"dispensAddr"`
|
||||||
|
PrinterName string `yaml:"printerName"`
|
||||||
|
LogDir string `yaml:"logdir"`
|
||||||
|
Dbport int `yaml:"dbport"` // Port for the database connection
|
||||||
|
Dbname string `yaml:"dbname"` // Database name for the connection
|
||||||
|
Dbuser string `yaml:"dbuser"` // User for the database connection
|
||||||
|
Dbpassword string `yaml:"dbpassword"` // Password for the database connection
|
||||||
|
IsPayment bool `yaml:"isPayment"`
|
||||||
|
TestMode bool `yaml:"testMode"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// ReadConfig reads config.yml and applies defaults.
|
||||||
|
func ReadHardlinkConfig() ConfigRec {
|
||||||
|
var cfg ConfigRec
|
||||||
|
const configName = "config.yml"
|
||||||
|
defaultPort := 9091
|
||||||
|
sep := string(os.PathSeparator)
|
||||||
|
|
||||||
|
data, err := os.ReadFile(configName)
|
||||||
|
if err != nil {
|
||||||
|
log.Warnf("ReadConfig %s: %v", configName, err)
|
||||||
|
} else if err := yaml.Unmarshal(data, &cfg); err != nil {
|
||||||
|
log.Warnf("Unmarshal config: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if cfg.Port == 0 {
|
||||||
|
cfg.Port = defaultPort
|
||||||
|
}
|
||||||
|
|
||||||
|
if cfg.LockType == "" {
|
||||||
|
err = fmt.Errorf("LockType is required in %s", configName)
|
||||||
|
handlers.FatalError(err)
|
||||||
|
}
|
||||||
|
cfg.LockType = strings.ToLower(cfg.LockType)
|
||||||
|
|
||||||
|
if cfg.LogDir == "" {
|
||||||
|
cfg.LogDir = "./logs" + sep
|
||||||
|
} else if !strings.HasSuffix(cfg.LogDir, sep) {
|
||||||
|
cfg.LogDir += sep
|
||||||
|
}
|
||||||
|
|
||||||
|
if cfg.Dbport <= 0 || cfg.Dbuser == "" || cfg.Dbname == "" || cfg.Dbpassword == "" {
|
||||||
|
err = fmt.Errorf("Database config (dbport, dbuser, dbname, dbpassword) are required in %s", configName)
|
||||||
|
log.Warnf(err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
return cfg
|
||||||
|
}
|
||||||
|
|
||||||
|
func ReadPreauthReleaserConfig() ConfigRec {
|
||||||
|
var cfg ConfigRec
|
||||||
|
const configName = "config.yml"
|
||||||
|
sep := string(os.PathSeparator)
|
||||||
|
|
||||||
|
data, err := os.ReadFile(configName)
|
||||||
|
if err != nil {
|
||||||
|
log.Warnf("ReadConfig %s: %v", configName, err)
|
||||||
|
} else if err := yaml.Unmarshal(data, &cfg); err != nil {
|
||||||
|
log.Warnf("Unmarshal config: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if cfg.Dbport <= 0 || cfg.Dbuser == "" || cfg.Dbname == "" || cfg.Dbpassword == "" {
|
||||||
|
err = fmt.Errorf("Database config (dbport, dbuser, dbname, dbpassword) are required in %s", configName)
|
||||||
|
handlers.FatalError(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if cfg.LogDir == "" {
|
||||||
|
cfg.LogDir = "./logs" + sep
|
||||||
|
} else if !strings.HasSuffix(cfg.LogDir, sep) {
|
||||||
|
cfg.LogDir += sep
|
||||||
|
}
|
||||||
|
return cfg
|
||||||
|
}
|
||||||
@@ -0,0 +1,200 @@
|
|||||||
|
package db
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
mssqldb "github.com/denisenkom/go-mssqldb" // for error inspection
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
|
||||||
|
"gitea.futuresens.co.uk/futuresens/hardlink/types"
|
||||||
|
)
|
||||||
|
|
||||||
|
// InitMSSQL opens and pings the SQL Server instance (keeps your original behaviour)
|
||||||
|
func InitMSSQL(port int, user, password, database string) (*sql.DB, error) {
|
||||||
|
if port <= 0 || user == "" || database == "" {
|
||||||
|
return nil, errors.New("incomplete database configuration")
|
||||||
|
}
|
||||||
|
|
||||||
|
dsn := fmt.Sprintf(
|
||||||
|
"sqlserver://%s:%s@%s:%d?database=%s&encrypt=disable",
|
||||||
|
user, password, "localhost", port, database,
|
||||||
|
)
|
||||||
|
|
||||||
|
db, err := sql.Open("sqlserver", dsn)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||||
|
defer cancel()
|
||||||
|
|
||||||
|
if err := db.PingContext(ctx); err != nil {
|
||||||
|
db.Close()
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := db.QueryRowContext(ctx, "SELECT 1").Scan(new(int)); err != nil {
|
||||||
|
db.Close()
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
log.Info("Database connection established")
|
||||||
|
return db, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseDateOnly(s string) (time.Time, error) {
|
||||||
|
parsed, err := time.Parse(types.CustomLayout, s)
|
||||||
|
if err == nil {
|
||||||
|
// construct midnight in local timezone, then convert to UTC for storage consistency
|
||||||
|
localMidnight := time.Date(parsed.Year(), parsed.Month(), parsed.Day(), 0, 0, 0, 0, time.Local)
|
||||||
|
return localMidnight.UTC(), nil
|
||||||
|
}
|
||||||
|
return time.Time{}, fmt.Errorf("parseDateOnly error: parsing %q: %w", s, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// InsertPreauth stores a preauthorization record. It is idempotent: duplicate TxnReference is ignored.
|
||||||
|
func InsertPreauth(ctx context.Context, db *sql.DB, m map[string]string, checkoutDate string) error {
|
||||||
|
const funcName = "InsertPreauth"
|
||||||
|
|
||||||
|
totalMinorUnits := m[types.TotalAmount]
|
||||||
|
txnReference := m[types.Reference]
|
||||||
|
if txnReference == "" {
|
||||||
|
return fmt.Errorf("%s: missing REFERENCE", funcName)
|
||||||
|
}
|
||||||
|
if totalMinorUnits == "" {
|
||||||
|
return fmt.Errorf("%s: missing TotalAmount", funcName)
|
||||||
|
}
|
||||||
|
|
||||||
|
// parse minor units, fallback to 0 on parse error but report it
|
||||||
|
amountInt, err := strconv.ParseInt(totalMinorUnits, 10, 64)
|
||||||
|
if err != nil {
|
||||||
|
log.WithFields(log.Fields{
|
||||||
|
"func": funcName,
|
||||||
|
"value": totalMinorUnits,
|
||||||
|
"error": err,
|
||||||
|
}).Warnf("parsing TotalAmount, defaulting to 0")
|
||||||
|
amountInt = 0
|
||||||
|
}
|
||||||
|
totalAmount := float64(amountInt) / 100.0
|
||||||
|
|
||||||
|
txnTime := time.Now().UTC()
|
||||||
|
|
||||||
|
// parse departure / checkout date and compute release date (48h after departure)
|
||||||
|
checkOutDate, err := parseDateOnly(checkoutDate)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("InsertPreauth: parsing checkoutDate %q: %w", checkoutDate, err)
|
||||||
|
}
|
||||||
|
releaseDate := checkOutDate.Add(48 * time.Hour)
|
||||||
|
|
||||||
|
const stmt = `
|
||||||
|
INSERT INTO dbo.Preauthorizations
|
||||||
|
(TxnReference, TotalMinorUnits, TotalAmount, TxnDateTime, DepartureDate, ReleaseDate)
|
||||||
|
VALUES
|
||||||
|
(@TxnReference, @TotalMinorUnits, @TotalAmount, @TxnDateTime, @DepartureDate, @ReleaseDate);
|
||||||
|
`
|
||||||
|
_, err = db.ExecContext(ctx, stmt,
|
||||||
|
sql.Named("TxnReference", txnReference),
|
||||||
|
sql.Named("TotalMinorUnits", totalMinorUnits),
|
||||||
|
sql.Named("TotalAmount", totalAmount),
|
||||||
|
sql.Named("TxnDateTime", txnTime),
|
||||||
|
sql.Named("DepartureDate", checkOutDate),
|
||||||
|
sql.Named("ReleaseDate", releaseDate),
|
||||||
|
)
|
||||||
|
if err != nil {
|
||||||
|
// handle duplicate-key (unique constraint) gracefully: SQL Server error numbers 2601/2627
|
||||||
|
var sqlErr mssqldb.Error
|
||||||
|
if errors.As(err, &sqlErr) {
|
||||||
|
if sqlErr.Number == 2627 || sqlErr.Number == 2601 {
|
||||||
|
log.Infof("InsertPreauth: preauth %s already exists (duplicate key) - ignoring", txnReference)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return fmt.Errorf("InsertPreauth exec: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Infof("Inserted preauth %s amount=%s minorUnits release=%s", txnReference, totalMinorUnits, releaseDate.Format(time.RFC3339))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// GetDuePreauths returns preauths with ReleaseDate <= now where Released = 0.
|
||||||
|
// If limit > 0, the query uses TOP(limit) to bound results at DB level.
|
||||||
|
func GetDuePreauths(ctx context.Context, db *sql.DB, now time.Time, limit int) ([]types.PreauthRec, error) {
|
||||||
|
baseQuery := `
|
||||||
|
SELECT Id, TxnReference, TotalMinorUnits, TotalAmount, TxnDateTime, DepartureDate, ReleaseDate, Released, ReleasedAt
|
||||||
|
FROM dbo.Preauthorizations
|
||||||
|
WHERE Released = 0 AND ReleaseDate <= @Now
|
||||||
|
ORDER BY ReleaseDate ASC
|
||||||
|
`
|
||||||
|
query := baseQuery
|
||||||
|
if limit > 0 {
|
||||||
|
// embed TOP to keep DB from returning everything; limit is controlled by the caller.
|
||||||
|
query = strings.Replace(baseQuery, "SELECT", fmt.Sprintf("SELECT TOP (%d)", limit), 1)
|
||||||
|
}
|
||||||
|
|
||||||
|
rows, err := db.QueryContext(ctx, query, sql.Named("Now", now))
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("GetDuePreauths query: %w", err)
|
||||||
|
}
|
||||||
|
defer rows.Close()
|
||||||
|
|
||||||
|
var out []types.PreauthRec
|
||||||
|
for rows.Next() {
|
||||||
|
var r types.PreauthRec
|
||||||
|
var departure sql.NullTime
|
||||||
|
var releasedAt sql.NullTime
|
||||||
|
// Note: adjust scanning targets if types.PreauthRec fields differ
|
||||||
|
if err := rows.Scan(
|
||||||
|
&r.Id,
|
||||||
|
&r.TxnReference,
|
||||||
|
&r.TotalMinorUnits,
|
||||||
|
&r.TotalAmount,
|
||||||
|
&r.TxnDateTime,
|
||||||
|
&departure,
|
||||||
|
&r.ReleaseDate,
|
||||||
|
&r.Released,
|
||||||
|
&releasedAt,
|
||||||
|
); err != nil {
|
||||||
|
return nil, fmt.Errorf("GetDuePreauths scan: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if departure.Valid {
|
||||||
|
r.DepartureDate = departure.Time
|
||||||
|
} else {
|
||||||
|
r.DepartureDate = time.Time{}
|
||||||
|
}
|
||||||
|
r.ReleasedAt = releasedAt
|
||||||
|
|
||||||
|
out = append(out, r)
|
||||||
|
}
|
||||||
|
if err := rows.Err(); err != nil {
|
||||||
|
return nil, fmt.Errorf("GetDuePreauths rows: %w", err)
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// MarkPreauthReleased sets Released=1 and stores the timestamp. Returns error if no rows updated.
|
||||||
|
func MarkPreauthReleased(ctx context.Context, db *sql.DB, txnReference string, releasedAt time.Time) error {
|
||||||
|
const stmt = `
|
||||||
|
UPDATE dbo.Preauthorizations
|
||||||
|
SET Released = 1, ReleasedAt = @ReleasedAt
|
||||||
|
WHERE TxnReference = @TxnReference AND Released = 0;
|
||||||
|
`
|
||||||
|
res, err := db.ExecContext(ctx, stmt, sql.Named("ReleasedAt", releasedAt), sql.Named("TxnReference", txnReference))
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("MarkPreauthReleased exec: %w", err)
|
||||||
|
}
|
||||||
|
n, err := res.RowsAffected()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("MarkPreauthReleased RowsAffected: %w", err)
|
||||||
|
}
|
||||||
|
if n == 0 {
|
||||||
|
return fmt.Errorf("no rows updated for %s (maybe already released)", txnReference)
|
||||||
|
}
|
||||||
|
log.Infof("Marked preauth %s released at %s", txnReference, releasedAt.Format(time.RFC3339))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
+28
-4
@@ -69,7 +69,7 @@ var (
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
func checkStatus(statusResp []byte) (string, error) {
|
func checkStatus(statusResp []byte) ([]string, error) {
|
||||||
if len(statusResp) > 3 {
|
if len(statusResp) > 3 {
|
||||||
statusBytes := statusResp[7:11] // Extract the relevant bytes from the response
|
statusBytes := statusResp[7:11] // Extract the relevant bytes from the response
|
||||||
// For each position, get the ASCII character, hex value, and mapped meaning.
|
// For each position, get the ASCII character, hex value, and mapped meaning.
|
||||||
@@ -84,17 +84,17 @@ func checkStatus(statusResp []byte) (string, error) {
|
|||||||
{pos: 4, value: statusBytes[3], mapper: statusPos3},
|
{pos: 4, value: statusBytes[3], mapper: statusPos3},
|
||||||
}
|
}
|
||||||
|
|
||||||
result := ""
|
result := make([]string, len(posStatus))
|
||||||
for _, p := range posStatus {
|
for _, p := range posStatus {
|
||||||
statusMsg, exists := p.mapper[p.value]
|
statusMsg, exists := p.mapper[p.value]
|
||||||
if !exists {
|
if !exists {
|
||||||
statusMsg = "Unknown status"
|
statusMsg = "Unknown status"
|
||||||
}
|
}
|
||||||
if p.value != 0x30 {
|
if p.value != 0x30 {
|
||||||
result += fmt.Sprintf("Status: %s; ", statusMsg)
|
result = append(result, fmt.Sprintf("Status: %s; ", statusMsg))
|
||||||
}
|
}
|
||||||
if p.pos == 4 && p.value == 0x38 {
|
if p.pos == 4 && p.value == 0x38 {
|
||||||
return result, fmt.Errorf("Card well empty")
|
return nil, fmt.Errorf("Card well empty")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result, nil
|
return result, nil
|
||||||
@@ -171,6 +171,26 @@ func InitializeDispenser() (*serial.Port, error) {
|
|||||||
return port, nil
|
return port, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func DispenserSequence(port *serial.Port) (string, error) {
|
||||||
|
const funcName = "dispenserSequence"
|
||||||
|
var result string
|
||||||
|
|
||||||
|
// Check dispenser status
|
||||||
|
status, err := CheckDispenserStatus(port)
|
||||||
|
if err != nil {
|
||||||
|
return status, fmt.Errorf("[%s] error checking dispenser status: %v", funcName, err)
|
||||||
|
}
|
||||||
|
result += status
|
||||||
|
|
||||||
|
// Send card to encoder position
|
||||||
|
status, err = CardToEncoderPosition(port)
|
||||||
|
if err != nil {
|
||||||
|
return status, fmt.Errorf("[%s] error sending card to encoder position: %v", funcName, err)
|
||||||
|
}
|
||||||
|
result += "; " + status
|
||||||
|
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
// if dispenser is not responding, I should repeat the command
|
// if dispenser is not responding, I should repeat the command
|
||||||
func CheckDispenserStatus(port *serial.Port) (string, error) {
|
func CheckDispenserStatus(port *serial.Port) (string, error) {
|
||||||
@@ -231,6 +251,8 @@ func CardToEncoderPosition(port *serial.Port) (string, error) {
|
|||||||
return "", fmt.Errorf("error sending ENQ to prompt device: %v", err)
|
return "", fmt.Errorf("error sending ENQ to prompt device: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
time.Sleep(delay)
|
||||||
|
|
||||||
//Check card position status
|
//Check card position status
|
||||||
status, err := CheckDispenserStatus(port)
|
status, err := CheckDispenserStatus(port)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -261,6 +283,8 @@ func CardOutOfMouth(port *serial.Port) (string, error) {
|
|||||||
return "", fmt.Errorf("error sending ENQ to prompt device: %v", err)
|
return "", fmt.Errorf("error sending ENQ to prompt device: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
time.Sleep(delay)
|
||||||
|
|
||||||
//Check card position status
|
//Check card position status
|
||||||
status, err := CheckDispenserStatus(port)
|
status, err := CheckDispenserStatus(port)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -3,13 +3,19 @@ module gitea.futuresens.co.uk/futuresens/hardlink
|
|||||||
go 1.23.2
|
go 1.23.2
|
||||||
|
|
||||||
require (
|
require (
|
||||||
gitea.futuresens.co.uk/futuresens/cmstypes v1.0.171
|
gitea.futuresens.co.uk/futuresens/cmstypes v1.0.190
|
||||||
gitea.futuresens.co.uk/futuresens/logging v1.0.9
|
gitea.futuresens.co.uk/futuresens/logging v1.0.9
|
||||||
github.com/alexbrainman/printer v0.0.0-20200912035444-f40f26f0bdeb
|
github.com/alexbrainman/printer v0.0.0-20200912035444-f40f26f0bdeb
|
||||||
|
github.com/denisenkom/go-mssqldb v0.12.3
|
||||||
github.com/sirupsen/logrus v1.9.3
|
github.com/sirupsen/logrus v1.9.3
|
||||||
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07
|
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07
|
||||||
golang.org/x/image v0.27.0
|
golang.org/x/image v0.27.0
|
||||||
gopkg.in/yaml.v3 v3.0.1
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
)
|
)
|
||||||
|
|
||||||
require golang.org/x/sys v0.32.0 // indirect
|
require (
|
||||||
|
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
|
||||||
|
github.com/golang-sql/sqlexp v0.1.0 // indirect
|
||||||
|
golang.org/x/crypto v0.3.0 // indirect
|
||||||
|
golang.org/x/sys v0.32.0 // indirect
|
||||||
|
)
|
||||||
|
|||||||
@@ -1,14 +1,26 @@
|
|||||||
gitea.futuresens.co.uk/futuresens/cmstypes v1.0.171 h1:/WM3mG5i4VYspeLaGFwjuvQJHM/Pks/dN3RjhrmYaN0=
|
gitea.futuresens.co.uk/futuresens/cmstypes v1.0.190 h1:OxP911wT8HQqBJ20KIZcBxi898rsYHhhCkne2u45p1A=
|
||||||
gitea.futuresens.co.uk/futuresens/cmstypes v1.0.171/go.mod h1:ABMUkdm+3VGrkuoCJsXMfPPud9GHDOwBb1NiifFqxes=
|
gitea.futuresens.co.uk/futuresens/cmstypes v1.0.190/go.mod h1:ABMUkdm+3VGrkuoCJsXMfPPud9GHDOwBb1NiifFqxes=
|
||||||
gitea.futuresens.co.uk/futuresens/fscrypto v0.0.0-20221125125050-9acaffd21362 h1:MnhYo7XtsECCU+5yVMo3tZZOOSOKGkl7NpOvTAieBTo=
|
gitea.futuresens.co.uk/futuresens/fscrypto v0.0.0-20221125125050-9acaffd21362 h1:MnhYo7XtsECCU+5yVMo3tZZOOSOKGkl7NpOvTAieBTo=
|
||||||
gitea.futuresens.co.uk/futuresens/fscrypto v0.0.0-20221125125050-9acaffd21362/go.mod h1:p95ouVfK4qyC20D3/k9QLsWSxD2pdweWiY6vcYi9hpM=
|
gitea.futuresens.co.uk/futuresens/fscrypto v0.0.0-20221125125050-9acaffd21362/go.mod h1:p95ouVfK4qyC20D3/k9QLsWSxD2pdweWiY6vcYi9hpM=
|
||||||
gitea.futuresens.co.uk/futuresens/logging v1.0.9 h1:uvCQq/plecB0z/bUWOhFhwyYUWGPkTBZHsYNL+3RFvI=
|
gitea.futuresens.co.uk/futuresens/logging v1.0.9 h1:uvCQq/plecB0z/bUWOhFhwyYUWGPkTBZHsYNL+3RFvI=
|
||||||
gitea.futuresens.co.uk/futuresens/logging v1.0.9/go.mod h1:pepS4+sreKTXJUp1Dq2RunpvQ0oY3vU2AuYjMTZzVQo=
|
gitea.futuresens.co.uk/futuresens/logging v1.0.9/go.mod h1:pepS4+sreKTXJUp1Dq2RunpvQ0oY3vU2AuYjMTZzVQo=
|
||||||
|
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.19.0/go.mod h1:h6H6c8enJmmocHUbLiiGY6sx7f9i+X3m1CHdd5c6Rdw=
|
||||||
|
github.com/Azure/azure-sdk-for-go/sdk/azidentity v0.11.0/go.mod h1:HcM1YX14R7CJcghJGOYCgdezslRSVzqwLf/q+4Y2r/0=
|
||||||
|
github.com/Azure/azure-sdk-for-go/sdk/internal v0.7.0/go.mod h1:yqy467j36fJxcRV2TzfVZ1pCb5vxm4BtZPUdYWe/Xo8=
|
||||||
github.com/alexbrainman/printer v0.0.0-20200912035444-f40f26f0bdeb h1:OzF7h5OJLiB2QvpxfFdUFdSedYYsEKAXnE8BwsWQPmY=
|
github.com/alexbrainman/printer v0.0.0-20200912035444-f40f26f0bdeb h1:OzF7h5OJLiB2QvpxfFdUFdSedYYsEKAXnE8BwsWQPmY=
|
||||||
github.com/alexbrainman/printer v0.0.0-20200912035444-f40f26f0bdeb/go.mod h1:aeB9oSJ1VNJXxBkCz6Krw3aW8lPx6rkWnW/hXcoujR4=
|
github.com/alexbrainman/printer v0.0.0-20200912035444-f40f26f0bdeb/go.mod h1:aeB9oSJ1VNJXxBkCz6Krw3aW8lPx6rkWnW/hXcoujR4=
|
||||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
|
github.com/denisenkom/go-mssqldb v0.12.3 h1:pBSGx9Tq67pBOTLmxNuirNTeB8Vjmf886Kx+8Y+8shw=
|
||||||
|
github.com/denisenkom/go-mssqldb v0.12.3/go.mod h1:k0mtMFOnU+AihqFxPMiF05rtiDrorD1Vrm1KEz5hxDo=
|
||||||
|
github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ=
|
||||||
|
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
|
||||||
|
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
|
||||||
|
github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
|
||||||
|
github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI=
|
||||||
|
github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
|
||||||
|
github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4/go.mod h1:4OwLy04Bl9Ef3GJJCoec+30X3LQs/0/m4HFRt/2LUSA=
|
||||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||||
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
|
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
|
||||||
@@ -19,16 +31,34 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs
|
|||||||
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
|
||||||
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 h1:UyzmZLoiDWMRywV4DUYb9Fbt8uiOSooupjTq10vpvnU=
|
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 h1:UyzmZLoiDWMRywV4DUYb9Fbt8uiOSooupjTq10vpvnU=
|
||||||
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
|
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
|
||||||
|
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||||
|
golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
|
||||||
|
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
|
||||||
golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A=
|
golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A=
|
||||||
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
|
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
|
||||||
golang.org/x/image v0.27.0 h1:C8gA4oWU/tKkdCfYT6T2u4faJu3MeNS5O8UPWlPF61w=
|
golang.org/x/image v0.27.0 h1:C8gA4oWU/tKkdCfYT6T2u4faJu3MeNS5O8UPWlPF61w=
|
||||||
golang.org/x/image v0.27.0/go.mod h1:xbdrClrAUway1MUTEZDq9mz/UpRwYAkFFNUslZtcB+g=
|
golang.org/x/image v0.27.0/go.mod h1:xbdrClrAUway1MUTEZDq9mz/UpRwYAkFFNUslZtcB+g=
|
||||||
|
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
|
||||||
|
golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
|
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
|
||||||
|
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||||
|
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||||
|
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
|
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
|
||||||
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
||||||
|
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||||
|
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||||
|
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||||
|
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||||
|
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
||||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
|
|||||||
@@ -0,0 +1,382 @@
|
|||||||
|
package handlers
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"database/sql"
|
||||||
|
"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/db"
|
||||||
|
"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/hardlink/types"
|
||||||
|
"gitea.futuresens.co.uk/futuresens/logging"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
type App struct {
|
||||||
|
dispPort *serial.Port
|
||||||
|
lockserver lockserver.LockServer
|
||||||
|
isPayment bool
|
||||||
|
db *sql.DB
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewApp(dispPort *serial.Port, lockType, encoderAddress string, db *sql.DB, isPayment bool) *App {
|
||||||
|
return &App{
|
||||||
|
isPayment: isPayment,
|
||||||
|
dispPort: dispPort,
|
||||||
|
lockserver: lockserver.NewLockServer(lockType, encoderAddress, FatalError),
|
||||||
|
db: db,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (app *App) RegisterRoutes(mux *http.ServeMux) {
|
||||||
|
mux.HandleFunc("/issuedoorcard", app.issueDoorCard)
|
||||||
|
mux.HandleFunc("/printroomticket", app.printRoomTicket)
|
||||||
|
mux.HandleFunc("/takepreauth", app.takePreauthorization)
|
||||||
|
mux.HandleFunc("/takepayment", app.takePayment)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (app *App) takePreauthorization(w http.ResponseWriter, r *http.Request) {
|
||||||
|
const op = logging.Op("takePreauthorization")
|
||||||
|
var (
|
||||||
|
theResponse cmstypes.ResponseRec
|
||||||
|
theRequest cmstypes.TransactionRec
|
||||||
|
trResult payment.TransactionResultXML
|
||||||
|
result payment.PaymentResult
|
||||||
|
save bool
|
||||||
|
)
|
||||||
|
|
||||||
|
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(types.ResultError, "Payment processing is disabled")
|
||||||
|
writeTransactionResult(w, http.StatusServiceUnavailable, theResponse)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if r.Method == http.MethodOptions {
|
||||||
|
w.WriteHeader(http.StatusNoContent)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Println("takePreauthorization called")
|
||||||
|
if r.Method != http.MethodPost {
|
||||||
|
theResponse.Data = payment.BuildFailureURL(types.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(types.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(types.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(types.LinkTakePreauthorization, "text/xml", bytes.NewBuffer(body))
|
||||||
|
if err != nil {
|
||||||
|
logging.Error(serviceName, err.Error(), "Payment processing error", string(op), "", "", 0)
|
||||||
|
theResponse.Data = payment.BuildFailureURL(types.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(types.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.FillFromTransactionResult(trResult)
|
||||||
|
|
||||||
|
if err := printer.PrintCardholderReceipt(result.CardholderReceipt); err != nil {
|
||||||
|
log.Errorf("PrintCardholderReceipt error: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
theResponse.Status = result.Status
|
||||||
|
theResponse.Data, save = payment.BuildPreauthRedirectURL(result.Fields)
|
||||||
|
if save {
|
||||||
|
db.InsertPreauth(r.Context(), app.db, result.Fields, theRequest.CheckoutDate)
|
||||||
|
}
|
||||||
|
writeTransactionResult(w, http.StatusOK, theResponse)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (app *App) takePayment(w http.ResponseWriter, r *http.Request) {
|
||||||
|
const op = logging.Op("takePayment")
|
||||||
|
var (
|
||||||
|
theResponse cmstypes.ResponseRec
|
||||||
|
theRequest cmstypes.TransactionRec
|
||||||
|
trResult payment.TransactionResultXML
|
||||||
|
result payment.PaymentResult
|
||||||
|
)
|
||||||
|
|
||||||
|
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(types.ResultError, "Payment processing is disabled")
|
||||||
|
writeTransactionResult(w, http.StatusServiceUnavailable, theResponse)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
if r.Method == http.MethodOptions {
|
||||||
|
w.WriteHeader(http.StatusNoContent)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Println("takePayment called")
|
||||||
|
if r.Method != http.MethodPost {
|
||||||
|
theResponse.Data = payment.BuildFailureURL(types.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(types.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(types.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(types.LinkTakePayment, "text/xml", bytes.NewBuffer(body))
|
||||||
|
if err != nil {
|
||||||
|
logging.Error(serviceName, err.Error(), "Payment processing error", string(op), "", "", 0)
|
||||||
|
theResponse.Data = payment.BuildFailureURL(types.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(types.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.FillFromTransactionResult(trResult)
|
||||||
|
|
||||||
|
if err := printer.PrintCardholderReceipt(result.CardholderReceipt); err != nil {
|
||||||
|
log.Errorf("PrintCardholderReceipt error: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
theResponse.Status = result.Status
|
||||||
|
theResponse.Data = payment.BuildPaymentRedirectURL(result.Fields)
|
||||||
|
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(types.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(types.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
|
||||||
|
}
|
||||||
|
|
||||||
|
// card to encoder position if not there already
|
||||||
|
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)
|
||||||
|
dispenser.DispenserSequence(app.dispPort)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// card out of mouth
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
|
||||||
|
// card to encoder position
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
|
||||||
|
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)
|
||||||
|
}
|
||||||
@@ -0,0 +1,42 @@
|
|||||||
|
// cmd/hardlink-preauth-release/main.go
|
||||||
|
package main
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
|
||||||
|
"gitea.futuresens.co.uk/futuresens/hardlink/bootstrap"
|
||||||
|
"gitea.futuresens.co.uk/futuresens/hardlink/config"
|
||||||
|
"gitea.futuresens.co.uk/futuresens/hardlink/logging"
|
||||||
|
"gitea.futuresens.co.uk/futuresens/hardlink/payment"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
buildVersion = "1.0.0"
|
||||||
|
serviceName = "preauth-release"
|
||||||
|
)
|
||||||
|
|
||||||
|
func main() {
|
||||||
|
config := config.ReadPreauthReleaserConfig()
|
||||||
|
// Setup logging and get file handle
|
||||||
|
logFile, err := logging.SetupLogging(config.LogDir, serviceName, buildVersion)
|
||||||
|
if err != nil {
|
||||||
|
log.Printf("Failed to set up logging: %v\n", err)
|
||||||
|
}
|
||||||
|
defer logFile.Close()
|
||||||
|
database, err := bootstrap.OpenDB(&config)
|
||||||
|
if err != nil {
|
||||||
|
log.WithError(err).Fatal("DB init failed")
|
||||||
|
}
|
||||||
|
defer database.Close()
|
||||||
|
|
||||||
|
if err := payment.ReleasePreauthorizations(database); err != nil {
|
||||||
|
log.WithError(err).Fatal("Preauth release failed")
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Info("Task completed successfully")
|
||||||
|
fmt.Println(". Press Enter to exit...")
|
||||||
|
fmt.Scanln()
|
||||||
|
os.Exit(0)
|
||||||
|
}
|
||||||
@@ -0,0 +1,74 @@
|
|||||||
|
package lockserver
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"time"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Build key encoding request command for the Assa Abloy lock server.
|
||||||
|
func (lock *AssaLockServer) BuildCommand(doorReq DoorCardRequest, checkIn, checkOut time.Time) error {
|
||||||
|
ci := checkIn.Format("200601021504")
|
||||||
|
co := checkOut.Format("200601021504")
|
||||||
|
|
||||||
|
lock.command = fmt.Sprintf("CCA;EA%s;GR%s;CO%s;CI%s;AM1;\r\n", lock.encoderAddr, doorReq.RoomField, co, ci)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Checks heart beat of the Assa Abloy lock server and perform key encoding
|
||||||
|
func (lock *AssaLockServer) LockSequence() error {
|
||||||
|
const funcName = "AssaLockServer.LockSequence"
|
||||||
|
|
||||||
|
conn, err := InitializeServerConnection(LockServerURL)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
|
||||||
|
resp, err := sendHeartbeatToServer(conn)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("[%s] heartbeat failed: %v", funcName, err)
|
||||||
|
}
|
||||||
|
log.Infof("Heartbeat response: %s", resp)
|
||||||
|
|
||||||
|
resp, err = requestEncoding(conn, lock.command)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("[%s] request encoding failed: %v", funcName, err)
|
||||||
|
}
|
||||||
|
log.Infof("Encoding response: %s", resp)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func sendHeartbeatToServer(conn net.Conn) (string, error) {
|
||||||
|
const heartbeatRegister = "CCC;EAHEARTBEAT;AM1;\r\n"
|
||||||
|
|
||||||
|
raw, err := sendAndReceive(conn, []byte(heartbeatRegister))
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to send Heartbeat command: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return parseAssaResponse(raw)
|
||||||
|
}
|
||||||
|
|
||||||
|
func requestEncoding(conn net.Conn, command string) (string, error) {
|
||||||
|
raw, err := sendAndReceive(conn, []byte(command))
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to send Encoding request: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return parseAssaResponse(raw)
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseAssaResponse(raw string) (string, error) {
|
||||||
|
clean := strings.ReplaceAll(raw, "\r\n", "")
|
||||||
|
idx := strings.Index(clean, "RC")
|
||||||
|
code := clean[idx+2 : idx+3] // Extract the response code
|
||||||
|
if code != "0" {
|
||||||
|
return "", fmt.Errorf("negative response code: %s", clean)
|
||||||
|
}
|
||||||
|
return "Success: " + clean, nil
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1,98 +0,0 @@
|
|||||||
package lockserver
|
|
||||||
|
|
||||||
import (
|
|
||||||
"bufio"
|
|
||||||
"fmt"
|
|
||||||
"net"
|
|
||||||
"net/url"
|
|
||||||
|
|
||||||
// "os"
|
|
||||||
"strings"
|
|
||||||
"time"
|
|
||||||
|
|
||||||
log "github.com/sirupsen/logrus"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
LockserverUrl string
|
|
||||||
)
|
|
||||||
|
|
||||||
func InitializeServerConnection() (net.Conn, error) {
|
|
||||||
const funcName = "InitializeServerConnection"
|
|
||||||
// Parse the URL to extract host and port
|
|
||||||
parsedUrl, err := url.Parse(LockserverUrl)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("[%s] failed to parse LockserverUrl: %v", funcName, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Remove any leading/trailing slashes just in case
|
|
||||||
address := strings.Trim(parsedUrl.Host, "/")
|
|
||||||
|
|
||||||
// Establish a TCP connection to the Visionline server
|
|
||||||
conn, err := net.Dial("tcp", address)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to connect to Visionline server: %v", err)
|
|
||||||
}
|
|
||||||
return conn, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func SendHeartbeatToServer(conn net.Conn) (string, error) {
|
|
||||||
const funcName = "SendHeartbeatToServer"
|
|
||||||
// Write the check command to the server
|
|
||||||
heartbeat := "CCC;EAHEARTBEAT;AM1;\r\n"
|
|
||||||
log.Printf("Sending headrbeat: %q", heartbeat)
|
|
||||||
_, err := conn.Write([]byte(heartbeat))
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("failed to send Heartbeat command: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// set a read timeout to avoid indefinite blocking
|
|
||||||
conn.SetReadDeadline(time.Now().Add(10 * time.Second))
|
|
||||||
|
|
||||||
// Read the response from the server. Visionline returns the response as ASCII text terminated by CRLF.
|
|
||||||
reader := bufio.NewReader(conn)
|
|
||||||
response, err := reader.ReadString('\n')
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("error reading response: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
substr := "RC"
|
|
||||||
response = strings.ReplaceAll(response, "\r\n", "") // Remove CRLF from the response
|
|
||||||
num := strings.Index(response, substr) // Find the index of the response code
|
|
||||||
responseCode := response[num+2 : len(response)-1] // Extract the result code from the response
|
|
||||||
if responseCode != "0" {
|
|
||||||
return "", fmt.Errorf("negative Heartbeat response code: %s", responseCode)
|
|
||||||
}
|
|
||||||
|
|
||||||
return "Success: " + response, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func RequestEncoding(conn net.Conn, command string) (string, error) {
|
|
||||||
const funcName = "RequestEncoding"
|
|
||||||
// Write the command to the connection
|
|
||||||
log.Printf("Sending Encoding request: %q", command)
|
|
||||||
_, err := conn.Write([]byte(command))
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("failed to send Encoding request: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
// Optional: set a read timeout to avoid indefinite blocking
|
|
||||||
conn.SetReadDeadline(time.Now().Add(10 * time.Second))
|
|
||||||
|
|
||||||
// Read the response from the server. Visionline returns the response as ASCII text terminated by CRLF.
|
|
||||||
reader := bufio.NewReader(conn)
|
|
||||||
response, err := reader.ReadString('\n')
|
|
||||||
if err != nil {
|
|
||||||
return "", fmt.Errorf("error reading response: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
substr := "RC"
|
|
||||||
response = strings.ReplaceAll(response, "\r\n", "") // Remove CRLF from the response
|
|
||||||
num := strings.Index(response, substr) // Find the index of the response code
|
|
||||||
responseCode := response[num+2 : len(response)-1] // Extract the result code from the response
|
|
||||||
if responseCode != "0" {
|
|
||||||
return "", fmt.Errorf("negative lock server response code: %s", responseCode)
|
|
||||||
}
|
|
||||||
|
|
||||||
return "Success: " + response, nil
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,115 @@
|
|||||||
|
package lockserver
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
// "io"
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"net/url"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
// DoorCardRequest is the JSON payload for /issue-door-card.
|
||||||
|
type DoorCardRequest struct {
|
||||||
|
RoomField string `json:"roomField"`
|
||||||
|
CheckinTime string `json:"checkinTime"`
|
||||||
|
CheckoutTime string `json:"checkoutTime"`
|
||||||
|
FollowStr string `json:"followStr"`
|
||||||
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
AssaAbloy = "assaabloy"
|
||||||
|
Omnitec = "omnitec"
|
||||||
|
Salto = "salto"
|
||||||
|
TLJ = "tlj"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
Cert string
|
||||||
|
LockServerURL string
|
||||||
|
)
|
||||||
|
|
||||||
|
type (
|
||||||
|
LockServer interface {
|
||||||
|
BuildCommand(doorReq DoorCardRequest, checkIn, checkOut time.Time) error
|
||||||
|
LockSequence() error
|
||||||
|
}
|
||||||
|
|
||||||
|
AssaLockServer struct {
|
||||||
|
encoderAddr string
|
||||||
|
command string
|
||||||
|
}
|
||||||
|
|
||||||
|
OmniLockServer struct {
|
||||||
|
encoderAddr string // Encoder unit address
|
||||||
|
command []byte // Command to be sent to the lock server
|
||||||
|
}
|
||||||
|
|
||||||
|
SaltoLockServer struct {
|
||||||
|
encoderAddr string
|
||||||
|
command []byte
|
||||||
|
}
|
||||||
|
|
||||||
|
TLJLockServer struct {
|
||||||
|
encoderAddr string
|
||||||
|
command string
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
func NewLockServer(lockType, encoderAddr string, fatalError func(error)) LockServer {
|
||||||
|
switch strings.ToLower(lockType) {
|
||||||
|
case AssaAbloy:
|
||||||
|
return &AssaLockServer{encoderAddr: encoderAddr}
|
||||||
|
case Omnitec:
|
||||||
|
return &OmniLockServer{encoderAddr: encoderAddr}
|
||||||
|
case Salto:
|
||||||
|
return &SaltoLockServer{encoderAddr: encoderAddr}
|
||||||
|
case TLJ:
|
||||||
|
return &TLJLockServer{encoderAddr: encoderAddr}
|
||||||
|
default:
|
||||||
|
fatalError(fmt.Errorf("unsupported LockType: %s; must be 'assaabloy' or 'omnitec'", lockType))
|
||||||
|
return nil // This line will never be reached, but is needed to satisfy the compiler
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func InitializeServerConnection(LockserverUrl string) (net.Conn, error) {
|
||||||
|
const funcName = "InitializeServerConnection"
|
||||||
|
// Parse the URL to extract host and port
|
||||||
|
parsedUrl, err := url.Parse(LockserverUrl)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("[%s] failed to parse LockserverUrl: %v", funcName, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove any leading/trailing slashes just in case
|
||||||
|
address := strings.Trim(parsedUrl.Host, "/")
|
||||||
|
|
||||||
|
// Establish a TCP connection to the Visionline server
|
||||||
|
conn, err := net.Dial("tcp", address)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to connect to lock server: %v", err)
|
||||||
|
}
|
||||||
|
return conn, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// sendAndReceive sends a command to the lock server and waits for a response.
|
||||||
|
func sendAndReceive(conn net.Conn, command []byte) (string, error) {
|
||||||
|
log.Printf("Sending command: %q", command)
|
||||||
|
_, err := conn.Write(command)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to send command: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
conn.SetReadDeadline(time.Now().Add(10 * time.Second))
|
||||||
|
|
||||||
|
buf := make([]byte, 128)
|
||||||
|
reader := bufio.NewReader(conn)
|
||||||
|
n, err := reader.Read(buf)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("error reading response: %v", err)
|
||||||
|
}
|
||||||
|
response := buf[:n]
|
||||||
|
return string(response), nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
package lockserver
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"os"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Build key encoding request command for the Omnitec lock server.
|
||||||
|
func (lock *OmniLockServer) BuildCommand(doorReq DoorCardRequest, checkIn, checkOut time.Time) error {
|
||||||
|
const funcName = "OmniLockServer.BuildCommand"
|
||||||
|
hostname, err := os.Hostname()
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("[%s] failed to get hostname: %v", funcName, err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Format lockId as 4-digit zero-padded string
|
||||||
|
idInt, err := strconv.Atoi(doorReq.RoomField)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("[%s] failed to convert lockId to integer: %v", funcName, err)
|
||||||
|
}
|
||||||
|
formattedLockId := fmt.Sprintf("%04d", idInt)
|
||||||
|
|
||||||
|
// Format date/time parts
|
||||||
|
dt := checkOut.Format("15:04") // DT = HH:mm
|
||||||
|
ga := checkIn.Format("060102") // GA = ddMMyy
|
||||||
|
gd := checkOut.Format("060102") // GD = ddMMyy
|
||||||
|
ti := checkIn.Format("150405") // TI = HHmmss
|
||||||
|
|
||||||
|
// Construct payload
|
||||||
|
payload := fmt.Sprintf(
|
||||||
|
"KR|KC%s|KTD|RN%s|%s|DT%s|G#75|GA%s|GD%s|KO0000|DA%s|TI%s|",
|
||||||
|
lock.encoderAddr,
|
||||||
|
formattedLockId,
|
||||||
|
hostname,
|
||||||
|
dt,
|
||||||
|
ga,
|
||||||
|
gd,
|
||||||
|
ga,
|
||||||
|
ti,
|
||||||
|
)
|
||||||
|
|
||||||
|
// Assign to command field with STX and ETX
|
||||||
|
lock.command = append([]byte{0x02}, append([]byte(payload), 0x03)...)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Starts link to the Omnitec lock server and perform key encoding
|
||||||
|
func (lock *OmniLockServer) LockSequence() error {
|
||||||
|
const funcName = "OmniLockServer.LockSequence"
|
||||||
|
|
||||||
|
conn, err := InitializeServerConnection(LockServerURL)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
|
||||||
|
// Start the link with the lock server
|
||||||
|
regs, err := lock.linkStart(conn)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("[%s] linkStart failed: %v", funcName, err)
|
||||||
|
}
|
||||||
|
for _, reg := range regs {
|
||||||
|
log.Printf("Received: %q", reg)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Request encoding from the lock server
|
||||||
|
raw, err := lock.requestEncoding(conn)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("[%s] request encoding failed: %v", funcName, err)
|
||||||
|
}
|
||||||
|
log.Infof("Encoding response: %s", raw)
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (lock *OmniLockServer) linkStart(conn net.Conn) ([]string, error) {
|
||||||
|
payload := fmt.Sprintf("LS|DA%s|TI%s|",
|
||||||
|
time.Now().Format("060102"),
|
||||||
|
time.Now().Format("150405"),
|
||||||
|
)
|
||||||
|
command := append([]byte{0x02}, append([]byte(payload), 0x03)...)
|
||||||
|
|
||||||
|
log.Printf("Sending command: %q", command)
|
||||||
|
_, err := conn.Write(command)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to send command: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
conn.SetReadDeadline(time.Now().Add(10 * time.Second))
|
||||||
|
reader := bufio.NewReader(conn)
|
||||||
|
|
||||||
|
var registers []string
|
||||||
|
for {
|
||||||
|
reg, err := reader.ReadString(0x03)
|
||||||
|
if err != nil {
|
||||||
|
if netErr, ok := err.(net.Error); ok && netErr.Timeout() {
|
||||||
|
break // timeout -> assume no more registers
|
||||||
|
}
|
||||||
|
return nil, fmt.Errorf("error reading register: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
registers = append(registers, reg)
|
||||||
|
|
||||||
|
// stop when you see the final register type, e.g. "LA|…|<ETX>"
|
||||||
|
if strings.HasPrefix(reg, "\x02LA|") {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return registers, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (lock *OmniLockServer) requestEncoding(conn net.Conn) (string, error) {
|
||||||
|
raw, err := sendAndReceive(conn, lock.command)
|
||||||
|
if err != nil {
|
||||||
|
return "", fmt.Errorf("failed to send Encoding request: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return parseOmniResponse(raw)
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseOmniResponse(raw string) (string, error) {
|
||||||
|
clean := strings.Trim(raw, "\x02\x03")
|
||||||
|
idx := strings.Index(clean, "AS")
|
||||||
|
code := clean[idx+2 : idx+4] // Extract the response code
|
||||||
|
code = strings.ToLower(code) // Convert to lowercase for consistency
|
||||||
|
if code != "ok" {
|
||||||
|
return "", fmt.Errorf("negative response code: %s", clean)
|
||||||
|
}
|
||||||
|
return "Success: " + clean, nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,226 @@
|
|||||||
|
package lockserver
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
STX = 0x02 // Start of Text
|
||||||
|
ETX = 0x03 // End of Text
|
||||||
|
ENQ = 0x05 // Enquiry from host
|
||||||
|
ACK = 0x06 // Positive response
|
||||||
|
NAK = 0x15 // Negative response
|
||||||
|
separator = 0xB3 // '│' character in ASCII (179 decimal)
|
||||||
|
)
|
||||||
|
|
||||||
|
// calculateLRC computes the Longitudinal Redundancy Check over data
|
||||||
|
func calculateLRC(data []byte) byte {
|
||||||
|
var lrc byte
|
||||||
|
for _, b := range data {
|
||||||
|
lrc ^= b
|
||||||
|
}
|
||||||
|
return lrc
|
||||||
|
}
|
||||||
|
|
||||||
|
// BuildCommand assembles the SALTO frame with fields #0–#10, STX/ETX and LRC
|
||||||
|
func (lock *SaltoLockServer) BuildCommand(req DoorCardRequest, checkIn, checkOut time.Time) error {
|
||||||
|
// helper: hh[mm]DDMMYY
|
||||||
|
fmtStamp := func(t time.Time) string {
|
||||||
|
return fmt.Sprintf("%02d%02d%02d%02d",
|
||||||
|
t.Hour(), t.Day(), int(t.Month()), t.Year()%100)
|
||||||
|
}
|
||||||
|
start := fmtStamp(checkIn)
|
||||||
|
expiry := fmtStamp(checkOut)
|
||||||
|
|
||||||
|
// command type
|
||||||
|
cmd := "CN"
|
||||||
|
if req.FollowStr == "1" {
|
||||||
|
cmd = "CC"
|
||||||
|
}
|
||||||
|
|
||||||
|
// fields 0–10
|
||||||
|
fields := []string{
|
||||||
|
cmd,
|
||||||
|
lock.encoderAddr,
|
||||||
|
"E",
|
||||||
|
req.RoomField,
|
||||||
|
"", // optional field 4
|
||||||
|
"", // 5
|
||||||
|
"", // 6
|
||||||
|
"", // 7
|
||||||
|
"", // 8
|
||||||
|
start,
|
||||||
|
expiry,
|
||||||
|
}
|
||||||
|
|
||||||
|
// build payload between STX and ETX
|
||||||
|
body := []byte{STX}
|
||||||
|
for _, f := range fields {
|
||||||
|
body = append(body, separator)
|
||||||
|
body = append(body, []byte(f)...)
|
||||||
|
}
|
||||||
|
body = append(body, separator)
|
||||||
|
body = append(body, ETX)
|
||||||
|
|
||||||
|
// append LRC (XOR of everything after STX through ETX)
|
||||||
|
lrc := calculateLRC(body[1:])
|
||||||
|
body = append(body, lrc)
|
||||||
|
|
||||||
|
lock.command = body
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// readFrame consumes a full frame starting with firstByte (expected STX).
|
||||||
|
// It reads up to ETX and then attempts to read a trailing LRC (or CR). timeout controls read deadlines.
|
||||||
|
func (lock *SaltoLockServer) readFrame(conn net.Conn, reader *bufio.Reader, firstByte byte, timeout time.Duration) ([]byte, error) {
|
||||||
|
frame := []byte{firstByte}
|
||||||
|
for {
|
||||||
|
conn.SetReadDeadline(time.Now().Add(timeout))
|
||||||
|
b, e := reader.ReadByte()
|
||||||
|
if e != nil {
|
||||||
|
return frame, fmt.Errorf("error reading frame body: %w", e)
|
||||||
|
}
|
||||||
|
frame = append(frame, b)
|
||||||
|
if b == ETX {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// read trailing LRC (or CR) if present (non-blocking w/ timeout)
|
||||||
|
conn.SetReadDeadline(time.Now().Add(timeout))
|
||||||
|
if lrc, e := reader.ReadByte(); e == nil {
|
||||||
|
frame = append(frame, lrc)
|
||||||
|
} else {
|
||||||
|
// Not fatal: some devices might omit LRC/CR — just log
|
||||||
|
log.Warnf("readFrame: no trailing LRC/CR: %v", e)
|
||||||
|
}
|
||||||
|
return frame, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// waitForAck waits for ACK or NAK. If STX frames are encountered they are drained
|
||||||
|
// using readFrame. drainedCount (if non-nil) accumulates the number of drained frames.
|
||||||
|
func (lock *SaltoLockServer) waitForAck(conn net.Conn, reader *bufio.Reader, timeout time.Duration, drainedCount *int) error {
|
||||||
|
deadline := time.Now().Add(timeout)
|
||||||
|
for {
|
||||||
|
conn.SetReadDeadline(time.Now().Add(time.Until(deadline)))
|
||||||
|
b, e := reader.ReadByte()
|
||||||
|
if e != nil {
|
||||||
|
return fmt.Errorf("error waiting for ACK/NAK: %w", e)
|
||||||
|
}
|
||||||
|
switch b {
|
||||||
|
case ACK:
|
||||||
|
return nil
|
||||||
|
case NAK:
|
||||||
|
return fmt.Errorf("received NAK")
|
||||||
|
case STX:
|
||||||
|
// stale or queued full response: consume it and continue waiting
|
||||||
|
frame, fe := lock.readFrame(conn, reader, b, timeout)
|
||||||
|
if fe != nil {
|
||||||
|
// if we can't consume frame, consider it an error
|
||||||
|
return fmt.Errorf("failed to consume queued STX frame: %w", fe)
|
||||||
|
}
|
||||||
|
if drainedCount != nil {
|
||||||
|
*drainedCount++
|
||||||
|
log.Infof("Drained queued frame #%d (while waiting for ACK): %q", *drainedCount, string(frame))
|
||||||
|
} else {
|
||||||
|
log.Infof("Drained queued frame (while waiting for ACK): %q", string(frame))
|
||||||
|
}
|
||||||
|
// loop to keep waiting for ACK
|
||||||
|
default:
|
||||||
|
// Unexpected byte while waiting for ACK. Log and continue reading.
|
||||||
|
log.Warnf("waitForAck: unexpected byte 0x%X while waiting for ACK; ignoring", b)
|
||||||
|
// keep looping until timeout or ACK/NAK
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// LockSequence performs the full ENQ/ACK handshake and command exchange
|
||||||
|
func (lock *SaltoLockServer) LockSequence() error {
|
||||||
|
const timeout = 20 * time.Second
|
||||||
|
var (
|
||||||
|
resp []byte
|
||||||
|
drained = 0 // count of stale frames consumed across waits
|
||||||
|
)
|
||||||
|
|
||||||
|
conn, err := InitializeServerConnection(LockServerURL)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
defer conn.Close()
|
||||||
|
|
||||||
|
reader := bufio.NewReader(conn)
|
||||||
|
|
||||||
|
// 1. Send ENQ
|
||||||
|
log.Infof("Sending ENQ")
|
||||||
|
if _, e := conn.Write([]byte{ENQ}); e != nil {
|
||||||
|
return fmt.Errorf("failed to send ENQ: %w", e)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Expect ACK (but drain any queued STX frames first)
|
||||||
|
if e := lock.waitForAck(conn, reader, timeout, &drained); e != nil {
|
||||||
|
return fmt.Errorf("error awaiting ACK to ENQ: %w", e)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Send command frame
|
||||||
|
log.Infof("Sending encoding command: %q", string(lock.command))
|
||||||
|
if _, e := conn.Write(lock.command); e != nil {
|
||||||
|
return fmt.Errorf("failed to send command frame: %w", e)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 4. Expect ACK to command (again drain any queued frames that might precede it)
|
||||||
|
if e := lock.waitForAck(conn, reader, timeout, &drained); e != nil {
|
||||||
|
return fmt.Errorf("error awaiting ACK to command: %w", e)
|
||||||
|
}
|
||||||
|
|
||||||
|
// 5. Now read the *next* STX frame which should be the response to our command.
|
||||||
|
for {
|
||||||
|
conn.SetReadDeadline(time.Now().Add(40 * time.Second))
|
||||||
|
b, e := reader.ReadByte()
|
||||||
|
if e != nil {
|
||||||
|
return fmt.Errorf("error reading response start: %w", e)
|
||||||
|
}
|
||||||
|
if b != STX {
|
||||||
|
// If anything else arrives, it might be another control byte or noise;
|
||||||
|
// log and keep consuming until we find STX.
|
||||||
|
log.Warnf("expected STX to start response but got 0x%X; ignoring", b)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// consume full response frame
|
||||||
|
frame, fe := lock.readFrame(conn, reader, b, timeout)
|
||||||
|
if fe != nil {
|
||||||
|
return fmt.Errorf("error reading response frame: %w", fe)
|
||||||
|
}
|
||||||
|
resp = append(resp, frame...)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
// parse the command code within response frame
|
||||||
|
if len(resp) >= 4 {
|
||||||
|
// The command bytes are usually at indices 2 and 3 if separator is at index 1
|
||||||
|
sepIndex := 1
|
||||||
|
b1 := resp[sepIndex+1]
|
||||||
|
b2 := resp[sepIndex+2]
|
||||||
|
switch {
|
||||||
|
case b1 == 'C' && b2 == 'N':
|
||||||
|
log.Infof("LockSequence: command response is CN (normal)")
|
||||||
|
case b1 == 'C' && b2 == 'C':
|
||||||
|
log.Infof("LockSequence: command response is CC (follow-up)")
|
||||||
|
case b1 == 'T' && b2 == 'D':
|
||||||
|
log.Warnf("LockSequence: command response is TD (room does not exist): %q", string(resp))
|
||||||
|
return fmt.Errorf("lock response indicates room does not exist: %q", string(resp))
|
||||||
|
default:
|
||||||
|
log.Warnf("LockSequence: unexpected command response %q", string(resp))
|
||||||
|
return fmt.Errorf("error encoding keycard, unexpected response: %q", string(resp))
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
log.Warnf("LockSequence: response too short: %q", string(resp))
|
||||||
|
return fmt.Errorf("response too short")
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Infof("LockSequence: received response: %q", string(resp))
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
package lockserver
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GuestCardResponse represents the JSON response from the GuestCard API call.
|
||||||
|
type GuestCardResponse struct {
|
||||||
|
Code string `json:"code"`
|
||||||
|
CardID string `json:"CardID"`
|
||||||
|
CommandID int `json:"CommandID"` // optional
|
||||||
|
Msg string `json:"Msg"` // error message if Code != "0"
|
||||||
|
}
|
||||||
|
|
||||||
|
func (lock *TLJLockServer) BuildCommand(doorReq DoorCardRequest, checkIn, checkOut time.Time) error {
|
||||||
|
params := url.Values{}
|
||||||
|
params.Set("cer", Cert)
|
||||||
|
params.Set("room", doorReq.RoomField)
|
||||||
|
params.Set("BeginTime", checkIn.Format("2006-01-02 15:04:05"))
|
||||||
|
params.Set("EndTime", checkOut.Format("2006-01-02 15:04:05"))
|
||||||
|
switch doorReq.FollowStr {
|
||||||
|
case "0":
|
||||||
|
params.Set("CheckInMode", "new")
|
||||||
|
case "1":
|
||||||
|
params.Set("CheckInMode", "follow")
|
||||||
|
}
|
||||||
|
lock.command = fmt.Sprintf("%s/GuestCard?%s", LockServerURL, params.Encode())
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (lock *TLJLockServer) LockSequence() error {
|
||||||
|
log.Infof("Sending command: %q", lock.command)
|
||||||
|
client := &http.Client{Timeout: 30 * time.Second}
|
||||||
|
resp, err := client.Get(lock.command)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("HTTP request failed: %v", err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
return fmt.Errorf("unexpected HTTP status: %s", resp.Status)
|
||||||
|
}
|
||||||
|
|
||||||
|
body, err := ioutil.ReadAll(resp.Body)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to read response: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Parse response JSON
|
||||||
|
var result GuestCardResponse
|
||||||
|
err = json.Unmarshal(body, &result)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("invalid JSON response: %v", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if result.Code != "0" {
|
||||||
|
log.Printf("API error %s: %s", result.Code, result.Msg)
|
||||||
|
return fmt.Errorf("API error %s: %s", result.Code, result.Msg)
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Printf("Guest card created successfully: CardID=%s, CommandID=%d", result.CardID, result.CommandID)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
package logging
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"os"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
// setupLogging ensures log directory, opens log file, and configures logrus.
|
||||||
|
// Returns the *os.File so caller can defer its Close().
|
||||||
|
func SetupLogging(logDir, serviceName, buildVersion string) (*os.File, error) {
|
||||||
|
fileName := logDir + serviceName + ".log"
|
||||||
|
f, err := os.OpenFile(fileName, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0666)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("open log file: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
log.SetOutput(f)
|
||||||
|
log.SetFormatter(&log.JSONFormatter{
|
||||||
|
TimestampFormat: time.RFC3339,
|
||||||
|
})
|
||||||
|
log.SetLevel(log.InfoLevel)
|
||||||
|
|
||||||
|
log.WithFields(log.Fields{
|
||||||
|
"buildVersion": buildVersion,
|
||||||
|
}).Info("Logging initialized")
|
||||||
|
|
||||||
|
return f, nil
|
||||||
|
}
|
||||||
@@ -1,80 +1,57 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
|
||||||
"encoding/xml"
|
"encoding/xml"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
|
"os/exec"
|
||||||
|
"os/signal"
|
||||||
"strings"
|
"strings"
|
||||||
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/tarm/serial"
|
"github.com/tarm/serial"
|
||||||
|
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
yaml "gopkg.in/yaml.v3"
|
|
||||||
|
|
||||||
|
"gitea.futuresens.co.uk/futuresens/hardlink/bootstrap"
|
||||||
|
"gitea.futuresens.co.uk/futuresens/hardlink/config"
|
||||||
"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/logging"
|
||||||
"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 = "0.9.0"
|
buildVersion = "1.0.28"
|
||||||
serviceName = "accesspoint"
|
serviceName = "hardlink"
|
||||||
customLayout = "2006-01-02 15:04:05 -0700"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// configRec holds values from config.yml.
|
|
||||||
type configRec struct {
|
|
||||||
Port int `yaml:"port"`
|
|
||||||
LockserverUrl string `yaml:"lockservUrl"`
|
|
||||||
EncoderAddress string `yaml:"encoderAddr"`
|
|
||||||
DispenserPort string `yaml:"dispensPort"`
|
|
||||||
DispenserAdrr string `yaml:"dispensAddr"`
|
|
||||||
PrinterName string `yaml:"printerName"`
|
|
||||||
LogDir string `yaml:"logdir"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// DoorCardRequest is the JSON payload for /issue-door-card.
|
|
||||||
type DoorCardRequest struct {
|
|
||||||
RoomField string `json:"roomField"`
|
|
||||||
CheckinTime string `json:"checkinTime"`
|
|
||||||
CheckoutTime string `json:"checkoutTime"`
|
|
||||||
FollowStr string `json:"followStr"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// App holds shared resources.
|
|
||||||
type App struct {
|
|
||||||
dispPort *serial.Port
|
|
||||||
lockConn net.Conn
|
|
||||||
config configRec
|
|
||||||
}
|
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
// Load config
|
// Load config
|
||||||
config := readConfig()
|
config := config.ReadHardlinkConfig()
|
||||||
|
|
||||||
printer.Layout = readTicketLayout()
|
printer.Layout = readTicketLayout()
|
||||||
printer.PrinterName = config.PrinterName
|
printer.PrinterName = config.PrinterName
|
||||||
|
lockserver.Cert = config.Cert
|
||||||
|
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 := logging.SetupLogging(config.LogDir, serviceName, buildVersion)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("Failed to set up logging: %v\n", err)
|
log.Printf("Failed to set up logging: %v\n", err)
|
||||||
}
|
}
|
||||||
defer logFile.Close()
|
defer logFile.Close()
|
||||||
|
|
||||||
// Initialize dispenser
|
// Initialize dispenser
|
||||||
|
if !config.TestMode {
|
||||||
dispenser.SerialPort = config.DispenserPort
|
dispenser.SerialPort = config.DispenserPort
|
||||||
dispenser.Address = []byte(config.DispenserAdrr)
|
dispenser.Address = []byte(config.DispenserAdrr)
|
||||||
dispHandle, err := dispenser.InitializeDispenser()
|
dispHandle, err = dispenser.InitializeDispenser()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
fatalError(err)
|
handlers.FatalError(err)
|
||||||
}
|
}
|
||||||
defer dispHandle.Close()
|
defer dispHandle.Close()
|
||||||
|
|
||||||
@@ -82,283 +59,63 @@ func main() {
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
if len(status) == 0 {
|
if len(status) == 0 {
|
||||||
err = fmt.Errorf("%s; wrong dispenser address: %s", err, config.DispenserAdrr)
|
err = fmt.Errorf("%s; wrong dispenser address: %s", err, config.DispenserAdrr)
|
||||||
fatalError(err)
|
handlers.FatalError(err)
|
||||||
} else {
|
} else {
|
||||||
fmt.Println(status)
|
fmt.Println(status)
|
||||||
fmt.Println(err.Error())
|
fmt.Println(err.Error())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
log.Infof("Dispenser initialized on port %s, %s", config.DispenserPort, status)
|
if status, err = dispenser.DispenserSequence(dispHandle); err != nil {
|
||||||
|
handlers.FatalError(err)
|
||||||
// Initialize lock-server connection once
|
}
|
||||||
lockserver.LockserverUrl = config.LockserverUrl
|
log.Infof("Dispenser initialized on port %s, %s", config.DispenserPort, status)
|
||||||
lockConn, err := lockserver.InitializeServerConnection()
|
|
||||||
if err != nil {
|
|
||||||
fatalError(err)
|
|
||||||
}
|
}
|
||||||
defer lockConn.Close()
|
|
||||||
|
|
||||||
log.Infof("Connected to lock server at %s", config.LockserverUrl)
|
// Test lock-server connection
|
||||||
|
switch strings.ToLower(config.LockType) {
|
||||||
|
case lockserver.TLJ:
|
||||||
|
|
||||||
|
default:
|
||||||
|
lockConn, err := lockserver.InitializeServerConnection(config.LockserverUrl)
|
||||||
|
if err != nil {
|
||||||
|
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()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
database, err := bootstrap.OpenDB(&config)
|
||||||
|
if err != nil {
|
||||||
|
log.Warnf("DB init failed: %v", err)
|
||||||
|
}
|
||||||
|
defer database.Close()
|
||||||
|
|
||||||
|
if config.IsPayment {
|
||||||
|
fmt.Println("Payment processing is enabled")
|
||||||
|
log.Info("Payment processing is enabled")
|
||||||
|
startChipDnaClient()
|
||||||
|
} else {
|
||||||
|
fmt.Println("Payment processing is disabled")
|
||||||
|
log.Info("Payment processing is disabled")
|
||||||
|
}
|
||||||
|
|
||||||
// Create App and wire routes
|
// Create App and wire routes
|
||||||
app := &App{
|
app := handlers.NewApp(dispHandle, config.LockType, config.EncoderAddress, database, config.IsPayment)
|
||||||
dispPort: dispHandle,
|
|
||||||
lockConn: lockConn,
|
|
||||||
config: 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)
|
|
||||||
}
|
|
||||||
|
|
||||||
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.
|
|
||||||
// Returns the *os.File so caller can defer its Close().
|
|
||||||
func setupLogging(logDir string) (*os.File, error) {
|
|
||||||
fileName := logDir + serviceName + ".log"
|
|
||||||
f, err := os.OpenFile(fileName, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0666)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("open log file: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
log.SetOutput(f)
|
|
||||||
log.SetFormatter(&log.JSONFormatter{
|
|
||||||
TimestampFormat: time.RFC3339,
|
|
||||||
})
|
|
||||||
log.SetLevel(log.InfoLevel)
|
|
||||||
|
|
||||||
log.WithFields(log.Fields{
|
|
||||||
"buildVersion": buildVersion,
|
|
||||||
}).Info("Logging initialized")
|
|
||||||
|
|
||||||
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) issueDoorCard(w http.ResponseWriter, r *http.Request) {
|
|
||||||
const op = logging.Op("issueDoorCard")
|
|
||||||
var (
|
|
||||||
doorReq DoorCardRequest
|
|
||||||
theResponse cmstypes.StatusRec
|
|
||||||
)
|
|
||||||
|
|
||||||
log.Println("issueDoorCard called")
|
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
// build command
|
|
||||||
ci := checkIn.Format("200601021504")
|
|
||||||
co := checkOut.Format("200601021504")
|
|
||||||
cmd := fmt.Sprintf("CCA;EA%s;GR%s;CO%s;CI%s;AM1;\r\n",
|
|
||||||
app.config.EncoderAddress, doorReq.RoomField, co, ci,
|
|
||||||
)
|
|
||||||
|
|
||||||
// dispenser sequence
|
|
||||||
if status, err := dispenser.CheckDispenserStatus(app.dispPort); err != nil {
|
|
||||||
if status != "" {
|
|
||||||
logging.Error(serviceName, status, "Dispenser error", string(op), "", "", 0)
|
|
||||||
writeError(w, http.StatusServiceUnavailable, "Dispenser error: "+err.Error())
|
|
||||||
} else {
|
|
||||||
logging.Error(serviceName, err.Error(), "Dispenser error", string(op), "", "", 0)
|
|
||||||
writeError(w, http.StatusServiceUnavailable, err.Error()+"; check card stock")
|
|
||||||
}
|
|
||||||
return
|
|
||||||
} else {
|
|
||||||
log.Info(status)
|
|
||||||
}
|
|
||||||
|
|
||||||
if status, err := dispenser.CardToEncoderPosition(app.dispPort); err != nil {
|
|
||||||
if status != "" {
|
|
||||||
logging.Error(serviceName, status, "Dispenser error", string(op), "", "", 0)
|
|
||||||
writeError(w, http.StatusServiceUnavailable, "Dispenser move error: "+err.Error())
|
|
||||||
} else {
|
|
||||||
logging.Error(serviceName, err.Error(), "Dispenser move error", string(op), "", "", 0)
|
|
||||||
writeError(w, http.StatusServiceUnavailable, "Dispenser move error: "+err.Error()+"; check card stock")
|
|
||||||
}
|
|
||||||
return
|
|
||||||
} else {
|
|
||||||
log.Info(status)
|
|
||||||
}
|
|
||||||
|
|
||||||
// lock server sequence
|
|
||||||
resp, err := lockserver.SendHeartbeatToServer(app.lockConn)
|
|
||||||
if err != nil {
|
|
||||||
logging.Error(serviceName, err.Error(), "Lock server heartbeat error", string(op), "", "", 0)
|
|
||||||
writeError(w, http.StatusBadGateway, "Lock server heartbeat failed: "+err.Error())
|
|
||||||
dispenser.CardOutOfMouth(app.dispPort)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
log.Infof("Heartbeat response: %s", resp)
|
|
||||||
resp, err = lockserver.RequestEncoding(app.lockConn, cmd)
|
|
||||||
if err != nil {
|
|
||||||
logging.Error(serviceName, err.Error(), "Lock server encoding error", string(op), "", "", 0)
|
|
||||||
writeError(w, http.StatusBadGateway, "Lock server encoding failed: "+err.Error())
|
|
||||||
dispenser.CardOutOfMouth(app.dispPort)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
log.Infof("Lock server response: %s", resp)
|
|
||||||
|
|
||||||
// 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")
|
|
||||||
log.Println("printRoomTicket called")
|
|
||||||
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
|
|
||||||
}
|
|
||||||
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.
|
|
||||||
func readConfig() configRec {
|
|
||||||
var cfg configRec
|
|
||||||
const configName = "config.yml"
|
|
||||||
defaultPort := 9091
|
|
||||||
sep := string(os.PathSeparator)
|
|
||||||
|
|
||||||
data, err := os.ReadFile(configName)
|
|
||||||
if err != nil {
|
|
||||||
log.Warnf("ReadConfig %s: %v", configName, err)
|
|
||||||
} else if err := yaml.Unmarshal(data, &cfg); err != nil {
|
|
||||||
log.Warnf("Unmarshal config: %v", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if cfg.Port == 0 {
|
|
||||||
cfg.Port = defaultPort
|
|
||||||
}
|
|
||||||
if cfg.LogDir == "" {
|
|
||||||
cfg.LogDir = "./logs" + sep
|
|
||||||
} else if !strings.HasSuffix(cfg.LogDir, sep) {
|
|
||||||
cfg.LogDir += sep
|
|
||||||
}
|
|
||||||
return cfg
|
|
||||||
}
|
|
||||||
|
|
||||||
func readTicketLayout() printer.LayoutOptions {
|
func readTicketLayout() printer.LayoutOptions {
|
||||||
const layoutName = "TicketLayout.xml"
|
const layoutName = "TicketLayout.xml"
|
||||||
var layout printer.LayoutOptions
|
var layout printer.LayoutOptions
|
||||||
@@ -366,13 +123,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)
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,183 @@
|
|||||||
|
package payment
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/hex"
|
||||||
|
"encoding/xml"
|
||||||
|
"fmt"
|
||||||
|
"net/http"
|
||||||
|
"net/url"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"gitea.futuresens.co.uk/futuresens/cmstypes"
|
||||||
|
"gitea.futuresens.co.uk/futuresens/hardlink/types"
|
||||||
|
_ "github.com/denisenkom/go-mssqldb"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
// XML parsing structs
|
||||||
|
type (
|
||||||
|
TransactionRec struct {
|
||||||
|
XMLName xml.Name `xml:"TransactionPayload"`
|
||||||
|
AmountMinorUnits string `xml:"amount"`
|
||||||
|
TransactionType string `xml:"transactionType"`
|
||||||
|
}
|
||||||
|
|
||||||
|
TransactionResultXML struct {
|
||||||
|
XMLName xml.Name `xml:"TransactionResult"`
|
||||||
|
Entries []EntryXML `xml:"Entry"`
|
||||||
|
}
|
||||||
|
|
||||||
|
EntryXML struct {
|
||||||
|
Key string `xml:"Key"`
|
||||||
|
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"`
|
||||||
|
}
|
||||||
|
|
||||||
|
PaymentResult struct {
|
||||||
|
Fields map[string]string
|
||||||
|
CardholderReceipt string
|
||||||
|
Status cmstypes.StatusRec
|
||||||
|
}
|
||||||
|
|
||||||
|
TransactionInfo struct {
|
||||||
|
transactionRes string
|
||||||
|
transactionState string
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
// ParseTransactionResult parses the XML into entries.
|
||||||
|
func (tr *TransactionResultXML) ParseTransactionResult(data []byte) error {
|
||||||
|
if err := xml.Unmarshal(data, &tr); err != nil {
|
||||||
|
return fmt.Errorf("XML unmarshal: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (ti *TransactionInfo) FillFromTransactionResult(trResult TransactionResultXML) {
|
||||||
|
for _, e := range trResult.Entries {
|
||||||
|
switch e.Key {
|
||||||
|
case types.TransactionResult:
|
||||||
|
ti.transactionRes = e.Value
|
||||||
|
case types.TransactionState:
|
||||||
|
ti.transactionState = e.Value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *PaymentResult) FillFromTransactionResult(trResult TransactionResultXML) {
|
||||||
|
if r.Fields == nil {
|
||||||
|
r.Fields = make(map[string]string)
|
||||||
|
}
|
||||||
|
|
||||||
|
for _, e := range trResult.Entries {
|
||||||
|
switch e.Key {
|
||||||
|
|
||||||
|
case types.ReceiptData, types.ReceiptDataMerchant:
|
||||||
|
// intentionally ignored
|
||||||
|
|
||||||
|
case types.ReceiptDataCardholder:
|
||||||
|
r.CardholderReceipt = e.Value
|
||||||
|
|
||||||
|
case types.TransactionResult:
|
||||||
|
r.Status.Message = e.Value
|
||||||
|
r.Status.Code = http.StatusOK
|
||||||
|
r.Fields[e.Key] = e.Value
|
||||||
|
|
||||||
|
default:
|
||||||
|
r.Fields[e.Key] = e.Value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// BuildRedirectURL builds the redirect URL to send the guest to after payment.
|
||||||
|
func BuildPaymentRedirectURL(result map[string]string) string {
|
||||||
|
res := result[types.TransactionResult]
|
||||||
|
|
||||||
|
// Transaction approved?
|
||||||
|
if strings.EqualFold(res, types.ResultApproved) {
|
||||||
|
// Transaction confirmed?
|
||||||
|
if strings.EqualFold(result[types.ConfirmResult], types.ResultApproved) {
|
||||||
|
log.WithField(types.LogResult, result[types.ConfirmResult]).
|
||||||
|
Info("Transaction approved and confirmed")
|
||||||
|
|
||||||
|
return buildSuccessURL(result)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Not confirmed
|
||||||
|
log.WithFields(log.Fields{types.LogFieldError: result[types.ConfirmResult], types.LogFieldDescription: result[types.ConfirmErrors]}).
|
||||||
|
Error("Transaction approved but not confirmed")
|
||||||
|
|
||||||
|
return BuildFailureURL(result[types.ConfirmResult], result[types.ConfirmErrors])
|
||||||
|
}
|
||||||
|
|
||||||
|
// Not approved
|
||||||
|
return BuildFailureURL(res, result[types.Errors])
|
||||||
|
}
|
||||||
|
|
||||||
|
func BuildPreauthRedirectURL(result map[string]string) (string, bool) {
|
||||||
|
res := result[types.TransactionResult]
|
||||||
|
tType := result[types.TransactionType]
|
||||||
|
|
||||||
|
// Transaction approved?
|
||||||
|
if strings.EqualFold(res, types.ResultApproved) {
|
||||||
|
switch {
|
||||||
|
// Transaction type AccountVerification?
|
||||||
|
case strings.EqualFold(tType, types.AccountVerificationType):
|
||||||
|
log.WithField(types.LogResult, result[types.TransactionResult]).
|
||||||
|
Info("Account verification approved")
|
||||||
|
|
||||||
|
return buildSuccessURL(result), false
|
||||||
|
|
||||||
|
// Transaction type Sale?
|
||||||
|
case strings.EqualFold(tType, types.SaleTransactionType):
|
||||||
|
// Transaction confirmed?
|
||||||
|
log.WithField(types.LogResult, result[types.ConfirmResult]).
|
||||||
|
Info("Amount preauthorized successfully")
|
||||||
|
|
||||||
|
return buildSuccessURL(result), true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Not approved
|
||||||
|
return BuildFailureURL(res, result[types.Errors]), false
|
||||||
|
}
|
||||||
|
|
||||||
|
func buildSuccessURL(result map[string]string) string {
|
||||||
|
q := url.Values{}
|
||||||
|
q.Set("CardNumber", hex.EncodeToString([]byte(result[types.PAN_MASKED])))
|
||||||
|
q.Set("ExpiryDate", hex.EncodeToString([]byte(result[types.EXPIRY_DATE])))
|
||||||
|
q.Set("TxnReference", result[types.Reference])
|
||||||
|
q.Set("CardHash", hex.EncodeToString([]byte(result[types.CardHash])))
|
||||||
|
q.Set("CardReference", hex.EncodeToString([]byte(result[types.CardReference])))
|
||||||
|
return (&url.URL{
|
||||||
|
Path: types.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 = types.ResultError
|
||||||
|
}
|
||||||
|
|
||||||
|
log.WithFields(log.Fields{types.LogFieldError: msgType, types.LogFieldDescription: description}).
|
||||||
|
Error("Transaction failed")
|
||||||
|
|
||||||
|
q.Set("MsgType", msgType)
|
||||||
|
q.Set("Description", description)
|
||||||
|
return (&url.URL{
|
||||||
|
Path: types.CheckinUnsuccessfulEndpoint,
|
||||||
|
RawQuery: q.Encode(),
|
||||||
|
}).String()
|
||||||
|
}
|
||||||
@@ -0,0 +1,237 @@
|
|||||||
|
package payment
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bytes"
|
||||||
|
"context"
|
||||||
|
"database/sql"
|
||||||
|
"encoding/xml"
|
||||||
|
"fmt"
|
||||||
|
"io"
|
||||||
|
"net/http"
|
||||||
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"gitea.futuresens.co.uk/futuresens/hardlink/db"
|
||||||
|
"gitea.futuresens.co.uk/futuresens/hardlink/types"
|
||||||
|
log "github.com/sirupsen/logrus"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
httpTimeout = 120 * time.Second
|
||||||
|
)
|
||||||
|
|
||||||
|
/* ==============================
|
||||||
|
Public Entry Point (LEGACY)
|
||||||
|
============================== */
|
||||||
|
|
||||||
|
func ReleasePreauthorizations(database *sql.DB) error {
|
||||||
|
ctx := context.Background()
|
||||||
|
now := time.Now().UTC()
|
||||||
|
client := &http.Client{Timeout: httpTimeout}
|
||||||
|
|
||||||
|
preauths, err := fetchDuePreauths(ctx, database, now)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if len(preauths) == 0 {
|
||||||
|
log.Info("No preauthorizations due for release")
|
||||||
|
return nil
|
||||||
|
} else {
|
||||||
|
log.Infof("%d preauthorizations due for release", len(preauths))
|
||||||
|
}
|
||||||
|
|
||||||
|
var failed []string
|
||||||
|
var completed int
|
||||||
|
for _, p := range preauths {
|
||||||
|
if err := handlePreauthRelease(ctx, database, client, p, now); err != nil {
|
||||||
|
log.Errorf("Preauth %s failed: %v", p.TxnReference, err)
|
||||||
|
failed = append(failed, p.TxnReference)
|
||||||
|
}
|
||||||
|
completed++
|
||||||
|
}
|
||||||
|
log.Infof("Preauth release completed: %d processed, %d failed", completed, len(failed))
|
||||||
|
|
||||||
|
if len(failed) > 0 {
|
||||||
|
return fmt.Errorf("preauth release incomplete, failed refs: %s", strings.Join(failed, ", "))
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ==============================
|
||||||
|
Core Business Logic
|
||||||
|
============================== */
|
||||||
|
|
||||||
|
func handlePreauthRelease(
|
||||||
|
ctx context.Context,
|
||||||
|
dbConn *sql.DB,
|
||||||
|
client *http.Client,
|
||||||
|
preauth types.PreauthRec,
|
||||||
|
now time.Time,
|
||||||
|
) error {
|
||||||
|
|
||||||
|
ref := preauth.TxnReference
|
||||||
|
log.Infof("Evaluating preauth %s", ref)
|
||||||
|
|
||||||
|
info, err := fetchTransactionInfo(ctx, client, ref)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// If already voided or declined → mark released
|
||||||
|
if isAlreadyReleased(info) {
|
||||||
|
return markReleased(ctx, dbConn, ref, now)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Only void approved + uncommitted
|
||||||
|
if !isVoidable(info) {
|
||||||
|
log.Infof("Preauth %s not eligible for void (res=%s state=%s)",
|
||||||
|
ref, info.transactionRes, info.transactionState)
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Void transaction
|
||||||
|
if err := voidPreauth(ctx, client, ref); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Verify final state
|
||||||
|
finalInfo, err := fetchTransactionInfo(ctx, client, ref)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if !isSuccessfullyVoided(finalInfo) {
|
||||||
|
return fmt.Errorf("unexpected final state res=%s state=%s",
|
||||||
|
finalInfo.transactionRes, finalInfo.transactionState)
|
||||||
|
}
|
||||||
|
|
||||||
|
log.Infof("Preauth %s successfully voided", ref)
|
||||||
|
return markReleased(ctx, dbConn, ref, now)
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ==============================
|
||||||
|
State Evaluation Helpers
|
||||||
|
============================== */
|
||||||
|
|
||||||
|
func isVoidable(info TransactionInfo) bool {
|
||||||
|
return strings.EqualFold(info.transactionRes, types.ResultApproved) &&
|
||||||
|
strings.EqualFold(info.transactionState, types.ResultStateUncommitted)
|
||||||
|
}
|
||||||
|
|
||||||
|
func isAlreadyReleased(info TransactionInfo) bool {
|
||||||
|
return strings.EqualFold(info.transactionState, types.ResultStateVoided) ||
|
||||||
|
strings.EqualFold(info.transactionRes, types.ResultDeclined)
|
||||||
|
}
|
||||||
|
|
||||||
|
func isSuccessfullyVoided(info TransactionInfo) bool {
|
||||||
|
return strings.EqualFold(info.transactionRes, types.ResultDeclined) &&
|
||||||
|
strings.EqualFold(info.transactionState, types.ResultStateVoided)
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ==============================
|
||||||
|
External Operations
|
||||||
|
============================== */
|
||||||
|
|
||||||
|
func fetchDuePreauths(
|
||||||
|
ctx context.Context,
|
||||||
|
dbConn *sql.DB,
|
||||||
|
now time.Time,
|
||||||
|
) ([]types.PreauthRec, error) {
|
||||||
|
|
||||||
|
return db.GetDuePreauths(ctx, dbConn, now, 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
func markReleased(
|
||||||
|
ctx context.Context,
|
||||||
|
dbConn *sql.DB,
|
||||||
|
ref string,
|
||||||
|
now time.Time,
|
||||||
|
) error {
|
||||||
|
|
||||||
|
return db.MarkPreauthReleased(ctx, dbConn, ref, now)
|
||||||
|
}
|
||||||
|
|
||||||
|
func fetchTransactionInfo(
|
||||||
|
ctx context.Context,
|
||||||
|
client *http.Client,
|
||||||
|
ref string,
|
||||||
|
) (TransactionInfo, error) {
|
||||||
|
|
||||||
|
var tr TransactionResultXML
|
||||||
|
var info TransactionInfo
|
||||||
|
|
||||||
|
payload, _ := xml.Marshal(types.TransactionReferenceRequest{
|
||||||
|
TransactionReference: ref,
|
||||||
|
})
|
||||||
|
|
||||||
|
body, err := postXML(ctx, client, types.LinkTransactionInformation, payload)
|
||||||
|
if err != nil {
|
||||||
|
return info, err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := tr.ParseTransactionResult(body); err != nil {
|
||||||
|
return info, err
|
||||||
|
}
|
||||||
|
|
||||||
|
info.FillFromTransactionResult(tr)
|
||||||
|
return info, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func voidPreauth(
|
||||||
|
ctx context.Context,
|
||||||
|
client *http.Client,
|
||||||
|
ref string,
|
||||||
|
) error {
|
||||||
|
|
||||||
|
var tr TransactionResultXML
|
||||||
|
var info TransactionInfo
|
||||||
|
|
||||||
|
payload, _ := xml.Marshal(types.TransactionReferenceRequest{
|
||||||
|
TransactionReference: ref,
|
||||||
|
})
|
||||||
|
|
||||||
|
body, err := postXML(ctx, client, types.LinkVoidTransaction, payload)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := tr.ParseTransactionResult(body); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
|
info.FillFromTransactionResult(tr)
|
||||||
|
|
||||||
|
if !strings.EqualFold(info.transactionRes, types.ResultApproved) {
|
||||||
|
return fmt.Errorf("void rejected: %s", info.transactionRes)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ==============================
|
||||||
|
Low-level HTTP
|
||||||
|
============================== */
|
||||||
|
|
||||||
|
func postXML(
|
||||||
|
ctx context.Context,
|
||||||
|
client *http.Client,
|
||||||
|
url string,
|
||||||
|
payload []byte,
|
||||||
|
) ([]byte, error) {
|
||||||
|
|
||||||
|
req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewReader(payload))
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
req.Header.Set("Content-Type", "text/xml")
|
||||||
|
|
||||||
|
resp, err := client.Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
|
||||||
|
return io.ReadAll(resp.Body)
|
||||||
|
}
|
||||||
+146
-15
@@ -5,13 +5,13 @@ import (
|
|||||||
"encoding/xml"
|
"encoding/xml"
|
||||||
"fmt"
|
"fmt"
|
||||||
"image"
|
"image"
|
||||||
|
|
||||||
"image/color"
|
"image/color"
|
||||||
"image/draw"
|
"image/draw"
|
||||||
_ "image/jpeg"
|
_ "image/jpeg"
|
||||||
_ "image/png"
|
_ "image/png"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/alexbrainman/printer"
|
"github.com/alexbrainman/printer"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
@@ -19,6 +19,21 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
type (
|
type (
|
||||||
|
CardholderReceipt struct {
|
||||||
|
XMLName xml.Name `xml:"ReceiptData"`
|
||||||
|
ReceiptEntries struct {
|
||||||
|
ReceiptEntry []ReceiptEntryXML `xml:"ReceiptEntry"`
|
||||||
|
} `xml:"ReceiptEntries"`
|
||||||
|
}
|
||||||
|
|
||||||
|
ReceiptEntryXML struct {
|
||||||
|
ReceiptEntryId string `xml:"ReceiptEntryId"`
|
||||||
|
Value string `xml:"Value"`
|
||||||
|
Label string `xml:"Label"`
|
||||||
|
ReceiptItemType string `xml:"ReceiptItemType"`
|
||||||
|
Priority string `xml:"Priority"`
|
||||||
|
}
|
||||||
|
|
||||||
RoomDetailsRec struct {
|
RoomDetailsRec struct {
|
||||||
XMLName xml.Name `xml:"roomdetails"`
|
XMLName xml.Name `xml:"roomdetails"`
|
||||||
Name string `xml:"customername"`
|
Name string `xml:"customername"`
|
||||||
@@ -54,19 +69,7 @@ type (
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
const (
|
||||||
Layout LayoutOptions
|
|
||||||
PrinterName string
|
|
||||||
)
|
|
||||||
|
|
||||||
func BuildRoomTicket(details RoomDetailsRec) ([]byte, error) {
|
|
||||||
var buf bytes.Buffer
|
|
||||||
|
|
||||||
// shortcuts
|
|
||||||
write := func(b []byte) { buf.Write(b) }
|
|
||||||
writeStr := func(s string) { buf.WriteString(s) }
|
|
||||||
|
|
||||||
const (
|
|
||||||
ESC = 0x1B
|
ESC = 0x1B
|
||||||
GS = 0x1D
|
GS = 0x1D
|
||||||
CENTER = 0x01
|
CENTER = 0x01
|
||||||
@@ -75,7 +78,27 @@ func BuildRoomTicket(details RoomDetailsRec) ([]byte, error) {
|
|||||||
LARGE_FONT = 0x11
|
LARGE_FONT = 0x11
|
||||||
WIDER_FONT = 0x10
|
WIDER_FONT = 0x10
|
||||||
NORMAL_FONT = 0x00
|
NORMAL_FONT = 0x00
|
||||||
)
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
Layout LayoutOptions
|
||||||
|
PrinterName string
|
||||||
|
)
|
||||||
|
|
||||||
|
func ParseCardholderReceipt(data []byte) ([]ReceiptEntryXML, error) {
|
||||||
|
var tr CardholderReceipt
|
||||||
|
if err := xml.Unmarshal(data, &tr); err != nil {
|
||||||
|
return nil, fmt.Errorf("XML unmarshal: %w", err)
|
||||||
|
}
|
||||||
|
return tr.ReceiptEntries.ReceiptEntry, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func BuildRoomTicket(details RoomDetailsRec) ([]byte, error) {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
|
||||||
|
// shortcuts
|
||||||
|
write := func(b []byte) { buf.Write(b) }
|
||||||
|
writeStr := func(s string) { buf.WriteString(s) }
|
||||||
|
|
||||||
// 0) Hotel logo at top
|
// 0) Hotel logo at top
|
||||||
logoBytes, err := printLogo(Layout.LogoPath)
|
logoBytes, err := printLogo(Layout.LogoPath)
|
||||||
@@ -144,6 +167,114 @@ func BuildRoomTicket(details RoomDetailsRec) ([]byte, error) {
|
|||||||
return buf.Bytes(), nil
|
return buf.Bytes(), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func PrintCardholderReceipt(cardholderReceipt string) error {
|
||||||
|
receiptEntries, err := ParseCardholderReceipt([]byte(cardholderReceipt))
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("ParseCardholderReceipt: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
data, err := BuildCardholderReceipt(receiptEntries)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("BuildCardholderReceipt: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Send to the Windows Epson TM-T82II via the printer package
|
||||||
|
if err := SendToPrinter(data); err != nil {
|
||||||
|
return fmt.Errorf("SendToPrinter: %w", err)
|
||||||
|
}
|
||||||
|
log.Info("Cardholder receipt printed successfully")
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func BuildCardholderReceipt(entries []ReceiptEntryXML) ([]byte, error) {
|
||||||
|
var buf bytes.Buffer
|
||||||
|
|
||||||
|
write := func(b []byte) { buf.Write(b) }
|
||||||
|
// writeStr := func(s string) { buf.WriteString(s) }
|
||||||
|
writeln := func(s string) {
|
||||||
|
buf.WriteString(s)
|
||||||
|
buf.WriteByte('\n')
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build a lookup map by ReceiptEntryId
|
||||||
|
m := make(map[string]ReceiptEntryXML, len(entries))
|
||||||
|
for _, e := range entries {
|
||||||
|
m[e.ReceiptEntryId] = e
|
||||||
|
}
|
||||||
|
|
||||||
|
// Utility to center text
|
||||||
|
// center := func(s string) {
|
||||||
|
// write([]byte{ESC, 'a', CENTER})
|
||||||
|
// writeln(s)
|
||||||
|
// write([]byte{ESC, 'a', 0})
|
||||||
|
// }
|
||||||
|
|
||||||
|
// Utility for bold lines
|
||||||
|
// boldOn := func() { write([]byte{GS, '!', WIDER_FONT}) }
|
||||||
|
// boldOff := func() { write([]byte{GS, '!', NORMAL_FONT}) }
|
||||||
|
|
||||||
|
// boldOn()
|
||||||
|
|
||||||
|
// 1) Header: CARDHOLDER COPY
|
||||||
|
writeln(m["Recipient"].Value)
|
||||||
|
// writeStr("\n\n")
|
||||||
|
// 2) Merchant name
|
||||||
|
writeln(m["MerchantName"].Value)
|
||||||
|
// writeStr("\n\n")
|
||||||
|
// 3) AID
|
||||||
|
writeln("AID: " + m["Aid"].Value)
|
||||||
|
|
||||||
|
// 4) Card scheme & pan
|
||||||
|
writeln(fmt.Sprintf("%s Card: %s", m["CardScheme"].Value, m["PanMasked"].Value))
|
||||||
|
|
||||||
|
// 5) PAN Seq No
|
||||||
|
writeln("PAN Seq No: " + m["PanSequence"].Value)
|
||||||
|
|
||||||
|
// 6) Transaction source
|
||||||
|
writeln(m["TransactionSource"].Value)
|
||||||
|
|
||||||
|
// 7) Transaction type (Sale/Account Verification)
|
||||||
|
writeln(m["TransactionType"].Value)
|
||||||
|
|
||||||
|
// 8) Total
|
||||||
|
// assuming value like "GBP1.50" — insert space after currency
|
||||||
|
total := m["TotalAmount"].Value
|
||||||
|
if !strings.HasPrefix(total, "GBP") && len(total) > 3 {
|
||||||
|
total = total[:3] + " " + total[3:]
|
||||||
|
}
|
||||||
|
writeln("TOTAL: " + total)
|
||||||
|
|
||||||
|
// 9) Cardholder verification
|
||||||
|
writeln(m["CardholderVerification"].Value)
|
||||||
|
|
||||||
|
// 10) Approved/Declined
|
||||||
|
writeln(m["TransactionResult"].Value)
|
||||||
|
|
||||||
|
// 11) Auth code
|
||||||
|
writeln("Auth Code: " + m["AuthCode"].Value)
|
||||||
|
|
||||||
|
// 12) Reference
|
||||||
|
writeln("Ref: " + m["AuthReference"].Value)
|
||||||
|
|
||||||
|
// 13) Merchant & terminal IDs
|
||||||
|
writeln("MID: " + m["MerchantIdMasked"].Value)
|
||||||
|
writeln("TID: " + m["TerminalIdMasked"].Value)
|
||||||
|
|
||||||
|
// 14) Date/time
|
||||||
|
writeln(m["AuthDateTime"].Value)
|
||||||
|
|
||||||
|
// 15) Retention message
|
||||||
|
writeln(m["RetentionMessage"].Value)
|
||||||
|
|
||||||
|
// boldOff()
|
||||||
|
|
||||||
|
// finally feed & cut
|
||||||
|
write([]byte{ESC, 'd', 7}) // Feed 5 lines
|
||||||
|
write([]byte{GS, 'V', 1})
|
||||||
|
|
||||||
|
return buf.Bytes(), nil
|
||||||
|
}
|
||||||
|
|
||||||
func printLogo(path string) ([]byte, error) {
|
func printLogo(path string) ([]byte, error) {
|
||||||
const maxLogoWidth = 384
|
const maxLogoWidth = 384
|
||||||
f, err := os.Open(path)
|
f, err := os.Open(path)
|
||||||
|
|||||||
+84
-1
@@ -1,4 +1,87 @@
|
|||||||
#### 0.9.0 - 22 May 2024
|
## Release notes
|
||||||
|
|
||||||
|
builtVersion is a const in main.go
|
||||||
|
|
||||||
|
#### 1.0.28 - 10 December 2025
|
||||||
|
added preauth releaser
|
||||||
|
|
||||||
|
#### 1.0.27 - 10 December 2025
|
||||||
|
updated handling AmountTooSmall response from creditcall
|
||||||
|
|
||||||
|
#### 1.0.26 - 10 December 2025
|
||||||
|
added route for taking preauthorization payment
|
||||||
|
|
||||||
|
#### 1.0.25 - 08 December 2025
|
||||||
|
return masked card number and expiry date in the payment success URL
|
||||||
|
|
||||||
|
#### 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
|
||||||
|
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 2025
|
||||||
|
added delay before checking dispenser status
|
||||||
|
|
||||||
|
#### 1.0.11 - 11 August 2025
|
||||||
|
updated Salto key encoding workflow
|
||||||
|
|
||||||
|
#### 1.0.10 - 08 August 2025
|
||||||
|
updated logging for TLJ locks
|
||||||
|
|
||||||
|
#### 1.0.9 - 08 August 2025
|
||||||
|
added TLJ lock server and implemented workflow for TLJ locks
|
||||||
|
|
||||||
|
#### 1.0.8 - 01 August 2025
|
||||||
|
improved error handling and logging in Salto
|
||||||
|
|
||||||
|
#### 1.0.7 - 25 July 2025
|
||||||
|
added check if the room exists
|
||||||
|
|
||||||
|
#### 1.0.6 - 25 July 2025
|
||||||
|
updated workflow for Salto locks
|
||||||
|
|
||||||
|
#### 1.0.5 - 24 July 2025
|
||||||
|
added encoding keycard copy for Salto locks
|
||||||
|
|
||||||
|
#### 1.0.4 - 22 July 2025
|
||||||
|
added salto lock server and implemented workflow for Salto
|
||||||
|
|
||||||
|
#### 1.0.0 - 30 June 2025
|
||||||
|
added creditcall payment method
|
||||||
|
`/starttransaction` - API payment endpoint to start a transaction
|
||||||
|
|
||||||
|
#### 0.9.1 - 22 May 2025
|
||||||
|
added lockserver interface and implemented workflow for Omnitec
|
||||||
|
|
||||||
|
#### 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.
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
package types
|
||||||
|
|
||||||
|
import (
|
||||||
|
"database/sql"
|
||||||
|
"encoding/xml"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
DateOnly = "2006-01-02"
|
||||||
|
CustomLayout = "2006-01-02 15:04:05 -0700"
|
||||||
|
LinkTakePreauthorization = "http://127.0.0.1:18181/start-transaction/"
|
||||||
|
LinkTakePayment = "http://127.0.0.1:18181/start-and-confirm-transaction/"
|
||||||
|
LinkTransactionInformation = "http://127.0.0.1:18181/transaction-information/"
|
||||||
|
LinkVoidTransaction = "http://127.0.0.1:18181/void-transaction/"
|
||||||
|
// Transaction types
|
||||||
|
SaleTransactionType = "sale"
|
||||||
|
AccountVerificationType = "account verification"
|
||||||
|
|
||||||
|
// Transaction results
|
||||||
|
ResultApproved = "approved"
|
||||||
|
ResultDeclined = "declined"
|
||||||
|
ResultCancelled = "cancelled"
|
||||||
|
ResultPending = "pending"
|
||||||
|
ResultStateUncommitted = "uncommitted"
|
||||||
|
ResultStateVoided = "voided"
|
||||||
|
ResultError = "error"
|
||||||
|
CheckinSuccessfulEndpoint = "/successful" // Endpoint to send guest to after successful payment
|
||||||
|
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"
|
||||||
|
PAN_MASKED = "PAN_MASKED"
|
||||||
|
EXPIRY_DATE = "EXPIRY_DATE"
|
||||||
|
TransactionResult = "TRANSACTION_RESULT"
|
||||||
|
TransactionType = "TRANSACTION_TYPE"
|
||||||
|
TransactionState = "TRANSACTION_STATE"
|
||||||
|
ConfirmResult = "CONFIRM_RESULT"
|
||||||
|
ConfirmErrors = "CONFIRM_ERRORS"
|
||||||
|
TotalAmount = "TOTAL_AMOUNT"
|
||||||
|
|
||||||
|
// Log field keys
|
||||||
|
LogFieldError = "error"
|
||||||
|
LogFieldDescription = "description"
|
||||||
|
LogResult = "transactionResult"
|
||||||
|
)
|
||||||
|
|
||||||
|
type (
|
||||||
|
TransactionReferenceRequest struct {
|
||||||
|
XMLName xml.Name `xml:"TransactionReferenceRequest"`
|
||||||
|
TransactionReference string `xml:"TransactionReference"`
|
||||||
|
}
|
||||||
|
|
||||||
|
PreauthRec struct {
|
||||||
|
Id int64
|
||||||
|
TxnReference string
|
||||||
|
TotalMinorUnits int64
|
||||||
|
TotalAmount float64
|
||||||
|
TxnDateTime time.Time
|
||||||
|
DepartureDate time.Time // date-only (00:00)
|
||||||
|
ReleaseDate time.Time
|
||||||
|
Released bool
|
||||||
|
ReleasedAt sql.NullTime
|
||||||
|
}
|
||||||
|
)
|
||||||
Reference in New Issue
Block a user