Compare commits

...

11 Commits

Author SHA1 Message Date
bel
bbe839bb88 make working hours, weekdays configurable by impl ntg 2022-01-30 08:34:14 -07:00
bel
60f19968e3 add ntg configurable work hours, weekdays 2022-01-30 08:29:06 -07:00
bel
c62d84b40a cache last ntg result for off hours 2022-01-29 18:59:16 -07:00
bel
1a072fee59 Merge branch 'master' of http://gogs.scratch.com:59515/bel/truckstop 2022-01-29 18:44:21 -07:00
bel
c4213e697d fuck backwards bool 2022-01-29 18:44:13 -07:00
bel
934a306bc9 log 2022-01-29 18:40:13 -07:00
Bel LaPointe
82bdbb1f3b todo 2022-01-27 20:18:13 -07:00
Bel LaPointe
b090cb86a5 fix offset to not need system timezone 2022-01-27 20:04:31 -07:00
Bel LaPointe
e42df54632 only do ntgvision searches 9-4 EST because 417s mean unauth until forced pw reset 2022-01-27 19:53:50 -07:00
Bel LaPointe
0120fdd0e2 accept !radius for miles radius search 2022-01-27 19:21:03 -07:00
Bel LaPointe
eab73aec04 include one very nice log 2022-01-27 19:00:40 -07:00
8 changed files with 148 additions and 12 deletions

View File

@@ -221,7 +221,43 @@ func (ntg NTGVision) SearchZips(zips []string) ([]Job, error) {
return jobs, nil
}
func (ntg NTGVision) workingHours(now time.Time) bool {
// TODO assert M-F 9-4 EST
now = now.In(time.FixedZone("EST", -5*60*60))
working := config.Get().Brokers.NTG.Working
logtr.Debugf("ntg.workingHours: now=%s, weekday=%v, hour=%v (ok=%+v)", now.String(), now.Weekday(), now.Hour(), working)
if ok := func() bool {
for _, hr := range working.Hours {
if now.Hour() == hr {
return true
}
}
return false
}(); !ok {
return false
}
if ok := func() bool {
for _, weekday := range working.Weekdays {
if now.Weekday() == time.Weekday(weekday) {
return true
}
}
return false
}(); !ok {
return false
}
return true
}
func (ntg NTGVision) SearchStates(states []config.State) ([]Job, error) {
if !ntg.workingHours(time.Now()) {
lastNtgB, _ := config.Get().DB().Get("ntg_last_search_states")
var jobs []Job
json.Unmarshal(lastNtgB, &jobs)
logtr.Verbosef("ntg.SearchStates: outside of working hours so returning ntg_last_search_states: %+v", jobs)
return jobs, nil
}
rc, err := ntg.searcher.searchStates(states)
if err != nil {
return nil, err
@@ -237,12 +273,22 @@ func (ntg NTGVision) SearchStates(states []config.State) ([]Job, error) {
var ntgjobs []ntgVisionJob
err = json.Unmarshal(b, &ntgjobs)
if err != nil {
return nil, err
}
jobs := make([]Job, len(ntgjobs))
for i := range jobs {
jobs[i] = ntgjobs[i].Job()
}
return jobs, err
jobsB, err := json.Marshal(jobs)
if err == nil {
config.Get().DB().Set("ntg_last_search_states", jobsB)
logtr.Verbosef("ntg.SearchStates: in working hours so setting ntg_last_search_states: %+v", jobs)
}
return jobs, nil
}
func getNTGTokenKey() string {
@@ -334,7 +380,7 @@ func (ntg NTGVision) _searchStates(states []config.State) (io.ReadCloser, error)
request2, _ := ntg.newRequest(states)
requestb, _ := ioutil.ReadAll(request2.Body)
logtr.Debugf("ntg auth bad status: url=%s, status=%v, body=%s, headers=%+v, request=%+v, requestb=%s", request.URL.String(), resp.StatusCode, b, resp.Header, request2, requestb)
if resp.StatusCode > 400 && resp.StatusCode < 404 {
if resp.StatusCode > 400 && resp.StatusCode < 404 || resp.StatusCode == 417 { // TODO wtf is 417 for
logtr.Debugf("ntg auth bad status: err no auth")
return nil, ErrNoAuth
}

22
broker/ntgvision_test.go Normal file
View File

@@ -0,0 +1,22 @@
package broker
import (
"local/truckstop/config"
"os"
"testing"
"time"
)
func TestWorkingHoursNTG(t *testing.T) {
os.Setenv("CONFIG", "../config.json")
if err := config.Refresh(nil); err != nil {
t.Fatal(err)
}
ntg := NTGVision{}
if !ntg.workingHours(time.Date(2022, 1, 27, 12, 0, 0, 0, time.FixedZone("MST", -7*60*60))) {
t.Fatal("noon MST not ok")
}
if ntg.workingHours(time.Date(2022, 1, 27, 23, 0, 0, 0, time.FixedZone("MST", -7*60*60))) {
t.Fatal("midnight MST ok")
}
}

View File

@@ -77,11 +77,15 @@
"Once": false,
"Brokers": {
"UseZips": true,
"RadiusMiles": 300,
"RadiusMiles": 200,
"NTG": {
"Enabled": true,
"Working": {
"Hours": [6, 7, 8, 9, 10, 11, 12, 13, 14, 15],
"Weekdays": [1, 2, 3, 4, 5]
},
"Enabled": false,
"JobInfo": true,
"Mock": false,
"Mock": true,
"LoadPageURIFormat": "https://ntgvision.com/LoadDetails?loadId=%d",
"LoadPageAPIURIFormat": "https://ntgvision.com/api/v1/load/LoadDetails?loadId=%d",
"Username": "noeasyrunstrucking@gmail.com",
@@ -89,9 +93,9 @@
},
"FastExact": {
"Enabled": true,
"Mock": false,
"Mock": true,
"Username": "birdman",
"Password": "166647"
}
}
}
}

View File

@@ -83,6 +83,10 @@
"Password": "p"
},
"NTG": {
"Working": {
"Hours": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23],
"Weekdays": [0, 1, 2, 3, 4, 5, 6]
},
"Enabled": true,
"JobInfo": true,
"Mock": true,

View File

@@ -67,6 +67,10 @@ type Config struct {
UseZips bool
RadiusMiles int
NTG struct {
Working struct {
Hours []int
Weekdays []int
}
Enabled bool
JobInfo bool
Mock bool

57
main.go
View File

@@ -13,6 +13,7 @@ import (
"net/url"
"regexp"
"sort"
"strconv"
"strings"
"sync"
"time"
@@ -84,9 +85,9 @@ func matrixrecv() error {
logtr.Debugf("sending help")
locationHelp := "`!state nc NC nC Nc` set states for self"
if config.Get().Brokers.UseZips {
locationHelp = "`!zip 27006 84058` to set zip codes for self"
locationHelp = "...`!zip 27006 84058` to set zip codes for self\n...`!radius 100` to set miles radius to 100, 200, or 300"
}
help := fmt.Sprintf("commands:\n...`!help` print this help\n...%s\n\nrun a command for someone else: `!zip 2022-12-31 @caleb`", locationHelp)
help := fmt.Sprintf("commands:\n...`!help` print this help\n%s\n\nrun a command for someone else: `!zip 2022-12-31 @caleb`", locationHelp)
if err := sender.Send(help); err != nil {
logtr.Errorf("failed to send help: %v", err)
} else {
@@ -151,6 +152,31 @@ func matrixrecv() error {
}
setNewStates(states)
}()
func() {
logtr.Verbosef("looking for radius")
db := config.Get().DB()
var radius *int
for _, msg := range messages {
key := fmt.Sprintf("radius_%d", msg.Timestamp.Unix())
if !strings.HasPrefix(msg.Content, "!radius ") {
continue
}
if _, err := db.Get(key); err == storage.ErrNotFound {
cmd := msg.Content
for strings.HasPrefix(cmd, "!radius ") {
cmd = strings.TrimPrefix(cmd, "!radius ")
}
n, err := strconv.Atoi(strings.TrimSpace(cmd))
if err == nil {
radius = &n
}
}
if err := db.Set(key, []byte{'k'}); err != nil {
logtr.Errorf("failed to mark radius gathered @%s: %v", key, err)
}
}
setNewRadius(radius)
}()
func() {
logtr.Verbosef("looking for pauses")
db := config.Get().DB()
@@ -183,6 +209,33 @@ func matrixrecv() error {
return nil
}
func setNewRadius(radius *int) {
if radius == nil {
return
}
sender := message.NewMatrix()
logtr.Debugf("set new radius: %d", *radius)
acceptable := map[int]struct{}{
100: struct{}{},
200: struct{}{},
300: struct{}{},
}
if _, ok := acceptable[*radius]; !ok {
sender.Send(fmt.Sprintf("radius of %v is not among acceptable %+v", *radius, acceptable))
logtr.Debugf("bad radius, not setting: %d", *radius)
return
}
conf := *config.Get()
if conf.Brokers.RadiusMiles == *radius {
logtr.Debugf("noop radius, not setting: %d", *radius)
return
}
conf.Brokers.RadiusMiles = *radius
logtr.Infof("updating config new pauses: %+v", conf)
config.Set(conf)
sender.Send(fmt.Sprintf("now using radius of %d mi for zip code search", *radius))
}
func setNewPauses(pauses map[string]time.Time) {
if len(pauses) == 0 {
return

View File

@@ -1,7 +1,4 @@
todo:
- fast exact does not use ID in UID because they spammy
- from states to zip codes w/ range
- modify old items once no longer available; drop stale jobs good candidate but requires new matrix interaction
- more than NTG; blue one
- !states emits current state
- test each !command callbacks to matrix
@@ -14,7 +11,11 @@ todo:
subtasks:
- banlist criteria like vendors, brokers, metadata
- set up copy for caleb, broc
- move from main() and make more functions
done:
- modify old items once no longer available; drop stale jobs good candidate but requires new matrix interaction
- from states to zip codes w/ range
- fast exact does not use ID in UID because they spammy
- fast exact is dumb or...?
- try search ntg by autoinc?
- TEST. Just like, refactor and test to shit.

View File

@@ -2,6 +2,7 @@ package zip
import (
_ "embed"
"local/truckstop/logtr"
"math"
"strconv"
"strings"
@@ -44,6 +45,7 @@ func init() {
State: state,
}
}
logtr.Infof("loaded %d zip codes", len(zips))
}
func alphafy(s string) string {