Extended demo to command line client for sending messages.

Also solved send-receive problem on startup. See: o3ma#7
kolAflash · Feb 15, 2017 · 713c943 · 713c943
1 parent ab0859f
commit 713c943
Showing 1 changed file with 183 additions and 43 deletions.
diff --git a/main.go b/main.go
@@ -1,39 +1,102 @@
-// This is a small bot that messages someone (ZX9TZZ7P) and replies to everything with a qouted echo
+// This is a small bot that messages someone and replies to everything with a qouted echo
+// Additionally you can send messages from commandline.
 package main
 
 import (
-	"fmt"
+	"bufio"
 	"log"
+	"flag"
+	"fmt"
 	"os"
+	"regexp"
+	"strings"
 
 	"github.com/o3ma/o3"
 )
 
+
 func main() {
+	pass, idpath, abpath, pubnick, rid, testMsg, createID := parseArgs()
+
+	trPtr, tidPtr, ctxPtr, receiveMsgChanPtr, sendMsgChanPtr := initialise(pass, idpath, abpath, pubnick, createID)
+
+	go receiveLoop(tidPtr, ctxPtr, receiveMsgChanPtr, sendMsgChanPtr)
+
+	sendTestMsg(trPtr, abpath, rid, testMsg, ctxPtr, sendMsgChanPtr)
+
+	sendLoop(trPtr, abpath, ctxPtr, sendMsgChanPtr)
+}
+
+
+func parseArgs() ([]byte, string, string, string, string, string, bool) {
+	cmdlnPubnick  := flag.String("nickname",        "parrot", "The nickname for the account (max. 32 chars).")
+	cmdlnConfdir  := flag.String("confdir",               "", "Path to the configuration directory.")
+	cmdlnPass     := flag.String("pass",          "01234567", "A string which must be at least 8 chars long.")
+	cmdlnTestID   := flag.String("testid",                "", "Send \"testmsg\" to this ID (8 character hex string).")
+	cmdlnTestMsg  := flag.String("testmsg", "Say something!", "Send this message to \"testid\".")
+	cmdlnCreateID := flag.Bool(  "createid",           false, "Create a new ID if nessesary without asking for confirmation.")
+	flag.Parse()
 
 	var (
-		pass    = []byte{0xA, 0xB, 0xC, 0xD, 0xE}
-		tr      o3.ThreemaRest
+		pass    = []byte{0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37} // 01234567
 		idpath  = "threema.id"
 		abpath  = "address.book"
-		tid     o3.ThreemaID
-		pubnick = "parrot"
-		rid     = "ZX9TZZ7P"
 	)
+
+	cmdlnPubnickVal := *cmdlnPubnick
+	if len(cmdlnPubnickVal) > 32 { cmdlnPubnickVal = cmdlnPubnickVal[0:32] }
+	pubnick := cmdlnPubnickVal
+
+	rid := ""
+	ridRegex := regexp.MustCompile("\\A[0-9A-Z]{8}\\z")
+	cmdlnTestIDVal := ridRegex.FindString(strings.ToUpper(*cmdlnTestID))
+	if cmdlnTestIDVal != "" && len(cmdlnTestIDVal) == 8 { rid = cmdlnTestIDVal }
+
+	testMsg := *cmdlnTestMsg
+
+	if len(*cmdlnPass) >= 8 { pass = []byte(*cmdlnPass) }
+
+	if (*cmdlnConfdir) != "" {
+		idpath = (*cmdlnConfdir) + "/" + idpath
+		abpath = (*cmdlnConfdir) + "/" + abpath
+	}
+
+	createId := *cmdlnCreateID
+
+	return pass, idpath, abpath, pubnick, rid, testMsg, createId
+}
+
+
+func initialise(pass []byte, idpath string, abpath string, pubnick string, createID bool) (*o3.ThreemaRest, *o3.ThreemaID, *o3.SessionContext, *(<-chan o3.ReceivedMsg), *(chan<- o3.Message)) {
+		var (
+			tr      o3.ThreemaRest
+			tid     o3.ThreemaID
+		)
 
 	// check whether an id file exists or else create a new one
 	if _, err := os.Stat(idpath); err != nil {
-		var err error
-		tid, err = tr.CreateIdentity()
-		if err != nil {
-			fmt.Println("CreateIdentity failed")
-			log.Fatal(err)
+		if !createID {
+			reader := bufio.NewReader(os.Stdin)
+			fmt.Print("No existing ID found. Create a new one? Enter YES (upper case) or NO: ")
+			text, _ := reader.ReadString('\n')
+			createID = (text == "YES\n")
 		}
-		fmt.Printf("Saving ID to %s\n", idpath)
-		err = tid.SaveToFile(idpath, pass)
-		if err != nil {
-			fmt.Println("saving ID failed")
-			log.Fatal(err)
+
+		if createID {
+			var err error
+			tid, err = tr.CreateIdentity()
+			if err != nil {
+				fmt.Println("CreateIdentity failed")
+				log.Fatal(err)
+			}
+			fmt.Printf("Saving ID to %s\n", idpath)
+			err = tid.SaveToFile(idpath, pass)
+			if err != nil {
+				fmt.Println("saving ID failed")
+				log.Fatal(err)
+			}
+		} else {
+			os.Exit(1)
 		}
 	} else {
 		fmt.Printf("Loading ID from %s\n", idpath)
@@ -58,41 +121,62 @@ func main() {
 		}
 	}
 
+	// let the session begin
+	fmt.Println("Starting session")
+	sendMsgChan, receiveMsgChan, err := ctx.Run()
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	return &tr, &tid, &ctx, &receiveMsgChan, &sendMsgChan
+}
+
+
+func sendTestMsg(trPtr *o3.ThreemaRest, abpath string, rid string, testMsg string, ctxPtr *o3.SessionContext, sendMsgChanPtr *(chan<- o3.Message)) {
+	tr := *trPtr
+	ctx := *ctxPtr
+	sendMsgChan := *sendMsgChanPtr
+
 	// check if we know the remote ID for
 	// (just demonstration purposes \bc sending and receiving functions do this lookup for us)
-	if _, b := ctx.ID.Contacts.Get(rid); b == false {
-		//retrieve the ID from Threema's servers
-		myID := o3.NewIDString(rid)
-		fmt.Printf("Retrieving %s from directory server\n", myID.String())
-		myContact, err := tr.GetContactByID(myID)
-		if err != nil {
-			log.Fatal(err)
+	if rid != "" {
+		if _, b := ctx.ID.Contacts.Get(rid); b == false {
+			//retrieve the ID from Threema's servers
+			myID := o3.NewIDString(rid)
+			fmt.Printf("Retrieving %s from directory server\n", myID.String())
+			myContact, err := tr.GetContactByID(myID)
+			if err != nil {
+				log.Fatal(err)
+			}
+			// add them to our address book
+			ctx.ID.Contacts.Add(myContact)
+
+			//and save the address book
+			fmt.Printf("Saving addressbook to %s\n", abpath)
+			err = ctx.ID.Contacts.SaveTo(abpath)
+			if err != nil {
+				fmt.Println("saving addressbook failed")
+				log.Fatal(err)
+			}
 		}
-		// add them to our address book
-		ctx.ID.Contacts.Add(myContact)
+	}
 
-		//and save the address book
-		fmt.Printf("Saving addressbook to %s\n", abpath)
-		err = ctx.ID.Contacts.SaveTo(abpath)
+	// send our initial message to our recipient
+	if rid != "" {
+		fmt.Println("Sending initial message to " + rid + ": " + testMsg)
+		err := ctx.SendTextMessage(rid, testMsg, sendMsgChan)
 		if err != nil {
-			fmt.Println("saving addressbook failed")
 			log.Fatal(err)
 		}
 	}
+}
 
-	// let the session begin
-	fmt.Println("Starting session")
-	sendMsgChan, receiveMsgChan, err := ctx.Run()
-	if err != nil {
-		log.Fatal(err)
-	}
 
-	// send our initial message to our recipient
-	fmt.Println("Sending initial message")
-	err = ctx.SendTextMessage(rid, "Say something!", sendMsgChan)
-	if err != nil {
-		log.Fatal(err)
-	}
+func receiveLoop(tidPtr *o3.ThreemaID, ctxPtr *o3.SessionContext, receiveMsgChanPtr *(<-chan o3.ReceivedMsg), sendMsgChanPtr *(chan<- o3.Message)) {
+	tid := *tidPtr
+	ctx := *ctxPtr
+	receiveMsgChan := *receiveMsgChanPtr
+	sendMsgChan := *sendMsgChanPtr
 
 	// handle incoming messages
 	for receivedMessage := range receiveMsgChan {
@@ -107,6 +191,7 @@ func main() {
 			// play the audio if you like
 		case o3.TextMessage:
 			// respond with a quote of what was send to us.
+			fmt.Printf("---- Received Message from: %s ----\n%s\n----------------------------------------\n", msg.Sender(), msg.Text())
 
 			// but only if it's no a message we sent to ourselves, avoid recursive neverending qoutes
 			if (tid.String() == msg.Sender().String()) {
@@ -117,7 +202,7 @@ func main() {
 			// of the form "> PERSONWEQUOTE: Text of qoute\nSomething we wanna add."
 			qoute := fmt.Sprintf("> %s: %s\n%s", msg.Sender(), msg.Text(), "Exactly!")
 			// we use the convinient "SendTextMessage" function to send
-			err = ctx.SendTextMessage(msg.Sender().String(), qoute, sendMsgChan)
+			err := ctx.SendTextMessage(msg.Sender().String(), qoute, sendMsgChan)
 			if err != nil {
 				log.Fatal(err)
 			}
@@ -152,3 +237,58 @@ func main() {
 	}
 
 }
+
+
+func sendLoop(trPtr *o3.ThreemaRest, abpath string, ctxPtr *o3.SessionContext, sendMsgChanPtr *(chan<- o3.Message)) {
+	tr := *trPtr
+	ctx := *ctxPtr
+	sendMsgChan := *sendMsgChanPtr
+
+	reader := bufio.NewReader(os.Stdin)
+
+	fmt.Println("  Sending thread startet! Send messages via: ---ID---MESSAGE (e.g. 1337ABCDHello World!)")
+	for {
+		rid_msg, _ := reader.ReadString('\n')
+		idValid := false
+		if len(rid_msg) >= 8 {
+			rid := rid_msg[0:8]
+			msg := rid_msg[8:len(rid_msg)-1]
+
+			ridRegex := regexp.MustCompile("\\A[0-9A-Z]{8}\\z")
+			rid = ridRegex.FindString(strings.ToUpper(rid))
+			if rid != "" && len(rid) == 8 {
+				idValid = true
+
+				if _, b := ctx.ID.Contacts.Get(rid); b == false {
+					//retrieve the ID from Threema's servers
+					myID := o3.NewIDString(rid)
+					fmt.Printf("  Retrieving %s from directory server\n", myID.String())
+					myContact, err := tr.GetContactByID(myID)
+					if err != nil {
+						log.Fatal(err)
+					}
+					// add them to our address book
+					ctx.ID.Contacts.Add(myContact)
+
+					//and save the address book
+					fmt.Printf("  Saving addressbook to %s\n", abpath)
+					err = ctx.ID.Contacts.SaveTo(abpath)
+					if err != nil {
+						fmt.Println("  saving addressbook failed")
+						log.Fatal(err)
+					}
+				}
+
+				fmt.Println("  Sending message to " + rid + ".")
+				err := ctx.SendTextMessage(rid, msg, sendMsgChan)
+				if err != nil {
+					log.Fatal(err)
+				}
+			}
+		}
+
+		if !idValid {
+			fmt.Println("  ID is invalid!")
+		}
+	}
+}