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

added functionality to receive messages

Browse Source 
see #8
This commit is contained in:
Bernhard B
2020-02-01 14:06:27 +01:00
parent 40d856fbef
commit b77c7c8b43
2 changed files with 48 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
README.md
View File

@@ -65,4 +65,14 @@ Sample REST API calls:
```curl -X POST -H "Content-Type: application/json" -d '{"message": "<message>", "base64_attachment": "<base64 encoded attachment>", "number": "<number>", "recipients": ["<recipient1>", "<recipient2>"]}' 'http://127.0.0.1:8080/v1/send'``` ```curl -X POST -H "Content-Type: application/json" -d '{"message": "<message>", "base64_attachment": "<base64 encoded attachment>", "number": "<number>", "recipients": ["<recipient1>", "<recipient2>"]}' 'http://127.0.0.1:8080/v1/send'```
In case you need more functionality, please **create a pull request** * Receive messages
Fetch all new messages in the inbox of the specified number.
```curl -X GET -H "Content-Type: application/json" 'http://127.0.0.1:8080/v1/receive/<number>'```
e.g:
```curl -X GET -H "Content-Type: application/json" 'http://127.0.0.1:8080/v1/receive/+431212131491291'```
In case you need more functionality, please **file a ticket** or **create a PR**

46
src/main.go
View File

@@ -13,6 +13,7 @@ import (
"os" "os"
"encoding/base64" "encoding/base64"
"encoding/json" "encoding/json"
"strings"
) )
func cleanupTmpFiles(paths []string) { func cleanupTmpFiles(paths []string) {
@@ -76,7 +77,7 @@ func send(c *gin.Context, attachmentTmpDir string, signalCliConfig string, numbe
cmd = append(cmd , attachmentTmpPaths...) cmd = append(cmd , attachmentTmpPaths...)
} }
err := runSignalCli(cmd) _, err := runSignalCli(cmd)
if err != nil { if err != nil {
cleanupTmpFiles(attachmentTmpPaths) cleanupTmpFiles(attachmentTmpPaths)
c.JSON(400, gin.H{"error": err.Error()}) c.JSON(400, gin.H{"error": err.Error()})
@@ -85,14 +86,16 @@ func send(c *gin.Context, attachmentTmpDir string, signalCliConfig string, numbe
c.JSON(201, nil) c.JSON(201, nil)
} }
func runSignalCli(args []string) error { func runSignalCli(args []string) (string, error) {
cmd := exec.Command("signal-cli", args...) cmd := exec.Command("signal-cli", args...)
var errBuffer bytes.Buffer var errBuffer bytes.Buffer
var outBuffer bytes.Buffer
cmd.Stderr = &errBuffer cmd.Stderr = &errBuffer
cmd.Stdout = &outBuffer
err := cmd.Start() err := cmd.Start()
if err != nil { if err != nil {
return err return "", err
} }
done := make(chan error, 1) done := make(chan error, 1)
@@ -103,15 +106,15 @@ func runSignalCli(args []string) error {
case <-time.After(60 * time.Second): case <-time.After(60 * time.Second):
err := cmd.Process.Kill() err := cmd.Process.Kill()
if err != nil { if err != nil {
return err return "", err
} }
return errors.New("process killed as timeout reached") return "", errors.New("process killed as timeout reached")
case err := <-done: case err := <-done:
if err != nil { if err != nil {
return errors.New(errBuffer.String()) return "", errors.New(errBuffer.String())
} }
} }
return nil return outBuffer.String(), nil
} }
func main() { func main() {
@@ -164,7 +167,7 @@ func main() {
command = append(command, "--voice") command = append(command, "--voice")
} }
err := runSignalCli(command) _, err := runSignalCli(command)
if err != nil { if err != nil {
c.JSON(400, err.Error()) c.JSON(400, err.Error())
return return
@@ -187,7 +190,7 @@ func main() {
} }
err := runSignalCli([]string{"--config", *signalCliConfig, "-u", number, "verify", token}) _, err := runSignalCli([]string{"--config", *signalCliConfig, "-u", number, "verify", token})
if err != nil { if err != nil {
c.JSON(400, gin.H{"error": err.Error()}) c.JSON(400, gin.H{"error": err.Error()})
return return
@@ -235,5 +238,30 @@ func main() {
send(c, *attachmentTmpDir, *signalCliConfig, req.Number, req.Message, req.Recipients, req.Base64Attachments) send(c, *attachmentTmpDir, *signalCliConfig, req.Number, req.Message, req.Recipients, req.Base64Attachments)
}) })
router.GET("/v1/receive/:number", func(c *gin.Context) {
number := c.Param("number")
command := []string{"--config", *signalCliConfig, "-u", number, "receive", "-t", "1", "--json"}
out, err := runSignalCli(command)
if err != nil {
c.JSON(400, err.Error())
return
}
out = strings.Trim(out, "\n")
lines := strings.Split(out, "\n")
jsonStr := "["
for i, line := range lines {
jsonStr += line
if i != (len(lines) - 1) {
jsonStr += ","
}
}
jsonStr += "]"
c.String(200, jsonStr)
})
router.Run() router.Run()
} }