aljaz/signal-cli-rest-api
1
0
Fork 0
mirror of https://github.com/aljazceru/signal-cli-rest-api.git synced 2025-12-22 00:54:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

handle non existing accounts.json gracefully

Browse Source 
see #363
This commit is contained in:
Bernhard B
2023-05-16 21:24:42 +02:00
parent 0dd742cb23
commit 99c760df66
1 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/main.go
View File

@@ -270,63 +270,67 @@ func main() {
Accounts []SignalCliAccountConfig `json:"accounts"` Accounts []SignalCliAccountConfig `json:"accounts"`
} }
signalCliConfigJsonData, err := ioutil.ReadFile(*signalCliConfig + "/data/accounts.json")
if err != nil {
log.Fatal("AUTO_RECEIVE_SCHEDULE: Couldn't read accounts.json: ", err.Error())
}
var signalCliAccountConfigs SignalCliAccountConfigs
err = json.Unmarshal(signalCliConfigJsonData, &signalCliAccountConfigs)
if err != nil {
log.Fatal("AUTO_RECEIVE_SCHEDULE: Couldn't parse accounts.json: ", err.Error())
}
autoReceiveScheduleReceiveTimeout := utils.GetEnv("AUTO_RECEIVE_SCHEDULE_RECEIVE_TIMEOUT", "10") autoReceiveScheduleReceiveTimeout := utils.GetEnv("AUTO_RECEIVE_SCHEDULE_RECEIVE_TIMEOUT", "10")
autoReceiveScheduleIgnoreAttachments := utils.GetEnv("AUTO_RECEIVE_SCHEDULE_IGNORE_ATTACHMENTS", "false") autoReceiveScheduleIgnoreAttachments := utils.GetEnv("AUTO_RECEIVE_SCHEDULE_IGNORE_ATTACHMENTS", "false")
autoReceiveScheduleIgnoreStories := utils.GetEnv("AUTO_RECEIVE_SCHEDULE_IGNORE_STORIES", "false") autoReceiveScheduleIgnoreStories := utils.GetEnv("AUTO_RECEIVE_SCHEDULE_IGNORE_STORIES", "false")
c := cron.New() c := cron.New()
c.Schedule(schedule, cron.FuncJob(func() { c.Schedule(schedule, cron.FuncJob(func() {
for _, account := range signalCliAccountConfigs.Accounts { accountsJsonPath := *signalCliConfig + "/data/accounts.json"
client := &http.Client{} if _, err := os.Stat(accountsJsonPath); err == nil {
signalCliConfigJsonData, err := ioutil.ReadFile(accountsJsonPath)
log.Debug("AUTO_RECEIVE_SCHEDULE: Calling receive for number ", account.Number)
req, err := http.NewRequest("GET", "http://127.0.0.1:" + port + "/v1/receive/" + account.Number, nil)
if err != nil { if err != nil {
log.Error("AUTO_RECEIVE_SCHEDULE: Couldn't call receive for number ", account.Number, ": ", err.Error()) log.Fatal("AUTO_RECEIVE_SCHEDULE: Couldn't read accounts.json: ", err.Error())
} }
var signalCliAccountConfigs SignalCliAccountConfigs
q := req.URL.Query() err = json.Unmarshal(signalCliConfigJsonData, &signalCliAccountConfigs)
q.Add("timeout", autoReceiveScheduleReceiveTimeout)
q.Add("ignore_attachments", autoReceiveScheduleIgnoreAttachments)
q.Add("ignore_stories", autoReceiveScheduleIgnoreStories)
req.URL.RawQuery = q.Encode()
resp, err := client.Do(req)
if err != nil { if err != nil {
log.Error("AUTO_RECEIVE_SCHEDULE: Couldn't call receive for number ", account.Number, ": ", err.Error()) log.Fatal("AUTO_RECEIVE_SCHEDULE: Couldn't parse accounts.json: ", err.Error())
} }
if resp.StatusCode != 200 { for _, account := range signalCliAccountConfigs.Accounts {
jsonResp, err := ioutil.ReadAll(resp.Body) client := &http.Client{}
resp.Body.Close()
log.Debug("AUTO_RECEIVE_SCHEDULE: Calling receive for number ", account.Number)
req, err := http.NewRequest("GET", "http://127.0.0.1:"+port+"/v1/receive/"+account.Number, nil)
if err != nil { if err != nil {
log.Error("AUTO_RECEIVE_SCHEDULE: Couldn't read json response: ", err.Error()) log.Error("AUTO_RECEIVE_SCHEDULE: Couldn't call receive for number ", account.Number, ": ", err.Error())
continue
} }
type ReceiveResponse struct { q := req.URL.Query()
Error string `json:"error"` q.Add("timeout", autoReceiveScheduleReceiveTimeout)
} q.Add("ignore_attachments", autoReceiveScheduleIgnoreAttachments)
var receiveResponse ReceiveResponse q.Add("ignore_stories", autoReceiveScheduleIgnoreStories)
err = json.Unmarshal(jsonResp, &receiveResponse) req.URL.RawQuery = q.Encode()
resp, err := client.Do(req)
if err != nil { if err != nil {
log.Error("AUTO_RECEIVE_SCHEDULE: Couldn't parse json response: ", err.Error()) log.Error("AUTO_RECEIVE_SCHEDULE: Couldn't call receive for number ", account.Number, ": ", err.Error())
continue
} }
log.Error("AUTO_RECEIVE_SCHEDULE: Couldn't call receive for number ", account.Number, ": ", receiveResponse) if resp.StatusCode != 200 {
jsonResp, err := ioutil.ReadAll(resp.Body)
resp.Body.Close()
if err != nil {
log.Error("AUTO_RECEIVE_SCHEDULE: Couldn't read json response: ", err.Error())
continue
}
type ReceiveResponse struct {
Error string `json:"error"`
}
var receiveResponse ReceiveResponse
err = json.Unmarshal(jsonResp, &receiveResponse)
if err != nil {
log.Error("AUTO_RECEIVE_SCHEDULE: Couldn't parse json response: ", err.Error())
continue
}
log.Error("AUTO_RECEIVE_SCHEDULE: Couldn't call receive for number ", account.Number, ": ", receiveResponse)
}
} }
} else {
log.Info("AUTO_RECEIVE_SCHEDULE: accounts.json doesn't exist")
} }
})) }))
c.Start() c.Start()