freedreamer82 · freedreamer82 · Jun 27, 2022 · Jun 27, 2022
diff --git a/README.md b/README.md
@@ -5,6 +5,7 @@ go console is a go lib to implement consoles, it includes:
 - Std output console
 - Telnet console
 - SSH console
+- MQTT console (with lib mqtt-shell of freedeamer82)
 - Other Consoles can be added easily(BLE,Serial etc..)
 
 
@@ -54,6 +55,20 @@ sshc, _ := console.NewSSHConsoleWithCertificates(sshPrivateKeyPath, sshAuthorize
 go sshc.Start("localhost", sshPort, 2)
 ```
 
+
+### Mqtt console example
+```sh
+func onNewConsole(console *console.Console) {
+	console.EnableLogin("root")
+}
+
+opt1 := console.WithOptionMqttConsoleMaxConnections(3)
+opt2 := console.WithOptionMqttConsoleTimeout(timeoutSec * time.Second)
+mqttConsole := console.NewMqttConsole(clientOps, "test", opt1, opt2)
+mqttConsole.AddCallbackOnNewConsole(onNewConsole)
+go mqttConsole.Start()
+```
+
 ### go console api
 handle operation
 - func (c *Console) Start()
@@ -155,4 +170,7 @@ go build
 
 //console ssh (pub keys)
 ./server 3
+
+//console mqtt
+./server 4
 ```
diff --git a/examples/server/main.go b/examples/server/main.go
@@ -2,7 +2,10 @@ package main
 
 import (
 	"fmt"
+	mqtt "github.com/eclipse/paho.mqtt.golang"
+	"github.com/freedreamer82/go-console/examples/utils"
 	"github.com/freedreamer82/go-console/pkg/console"
+	log "github.com/sirupsen/logrus"
 	"os"
 	"strconv"
 	"time"
@@ -19,7 +22,7 @@ var users = map[string]string{
 
 const sshPrivateKeyPath = "examples/utils/server_rsa"
 const sshPrivateKeyPassPhrase = "test"
-const timeoutSec = 10
+const timeoutSec = 20
 
 //client1 and client2 are authorized
 const sshAuthorizedKeysPath = "examples/utils/authorized_keys"
@@ -29,10 +32,11 @@ const (
 	Telnet
 	SSHPassword
 	SSHPublicKey
+	Mqtt
 )
 
 //change this const to start another console
-const example = StdOutput
+const example = Mqtt
 
 func main() {
 
@@ -51,11 +55,13 @@ func main() {
 		startSSHPasswordConsole()
 	case SSHPublicKey:
 		startSSHPublicKeyConsole()
+	case Mqtt:
+		startMqttConsole()
 	}
 
 }
 
-func onNewTelnetConsole(console *console.Console) {
+func onNewConsole(console *console.Console) {
 	console.EnableLogin("root")
 }
 
@@ -73,7 +79,7 @@ func startTelnetConsole() {
 	fmt.Printf("opening Telnet console on localhost %d", telnetPort)
 	fmt.Println()
 	ct := console.NewTelnetConsole(telnetPort, 2)
-	ct.AddCallbackOnNewConsole(onNewTelnetConsole)
+	ct.AddCallbackOnNewConsole(onNewConsole)
 	ct.SetTimeout(timeoutSec * time.Second)
 	select {}
 }
@@ -97,3 +103,22 @@ func startSSHPublicKeyConsole() {
 	go sshc.Start("localhost", sshPort, 2)
 	select {}
 }
+
+func startMqttConsole() {
+	fmt.Printf("opening Mqtt console")
+	fmt.Println()
+	clientOps := mqtt.NewClientOptions()
+	addr := fmt.Sprintf("tcp://%s:%d", utils.BrokerHost, utils.BrokerPort)
+	log.Info("Connecting to : " + addr)
+	clientOps.AddBroker(addr)
+	if utils.BrokerUser != "" && utils.BrokerPassword != "" {
+		clientOps.SetUsername(utils.BrokerUser)
+		clientOps.SetPassword(utils.BrokerPassword)
+	}
+	opt1 := console.WithOptionMqttConsoleMaxConnections(3)
+	opt2 := console.WithOptionMqttConsoleTimeout(timeoutSec * time.Second)
+	mqttConsole := console.NewMqttConsole(clientOps, "test", opt1, opt2)
+	mqttConsole.AddCallbackOnNewConsole(onNewConsole)
+	go mqttConsole.Start()
+	select {}
+}
diff --git a/examples/utils/brokerconf.go b/examples/utils/brokerconf.go
@@ -0,0 +1,6 @@
+package utils
+
+const BrokerHost = ""
+const BrokerPort = 1883
+const BrokerUser = ""
+const BrokerPassword = ""
diff --git a/go.mod b/go.mod
@@ -1,15 +1,20 @@
-module  github.com/freedreamer82/go-console
+module github.com/freedreamer82/go-console
 
 go 1.18
 
 require (
+	github.com/eclipse/paho.mqtt.golang v1.4.1
+	github.com/freedreamer82/mqtt-shell v0.0.0-20220624081242-fdcac9e75f9d
 	github.com/lithammer/shortuuid/v3 v3.0.7
 	github.com/sirupsen/logrus v1.8.1
 	golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9
 	golang.org/x/term v0.0.0-20220411215600-e5f449aeb171
 )
 
 require (
-	github.com/google/uuid v1.2.0 // indirect
-	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
+	golang.org/x/net v0.0.0-20220607020251-c690dde0001d // indirect
+	golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
+	golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d // indirect
 )
diff --git a/pkg/console/console.go b/pkg/console/console.go
@@ -72,7 +72,15 @@ type Console struct {
 	uuid             string
 }
 
-func NewConsole(iorw ConsoleI) *Console {
+type ConsoleOption func(console *Console)
+
+func WithOptionCustomUUID(uuid string) ConsoleOption {
+	return func(console *Console) {
+		console.uuid = uuid
+	}
+}
+
+func NewConsole(iorw ConsoleI, opts ...ConsoleOption) *Console {
 
 	c := Console{term: terminal.NewTerminal(iorw, prompt), eol: eol, mask: 0,
 		welcome: defaultWelcome, userLevel: Root, iorw: iorw, onclose: nil}
@@ -86,6 +94,10 @@ func NewConsole(iorw ConsoleI) *Console {
 	c.timeout = 0
 	c.lastActivitytime = time.Now()
 
+	for _, opt := range opts {
+		opt(&c)
+	}
+
 	c.AddCallbackOnClose(c.dummyCb)
 	log.Printf("Open Console %s", c.uuid)
 	return &c
@@ -184,6 +196,7 @@ func (c *Console) handleLogin(cmd string) bool {
 	if cmd == c.password {
 		c.mask.ToggleFlag(USER_LOGGED)
 		c.enablePrompt(true)
+		c.Print("Authenticated")
 		return true
 	}
 	return false