From e7b193788a56ee7cdb02a87a9db0ad6724ef66d5 Mon Sep 17 00:00:00 2001 From: Wim Date: Mon, 31 Jan 2022 00:13:37 +0100 Subject: Rewrite whatsapp bridge to use whatsmeow --- bridge/whatsapp/handlers.go | 270 ++++++++++++++++++-------------------------- bridge/whatsapp/helpers.go | 163 +++++++++----------------- bridge/whatsapp/whatsapp.go | 254 ++++++++++++++++++++--------------------- 3 files changed, 285 insertions(+), 402 deletions(-) diff --git a/bridge/whatsapp/handlers.go b/bridge/whatsapp/handlers.go index 1be9b5e3..f0512a74 100644 --- a/bridge/whatsapp/handlers.go +++ b/bridge/whatsapp/handlers.go @@ -4,126 +4,92 @@ import ( "fmt" "mime" "strings" - "time" "github.com/42wim/matterbridge/bridge/config" "github.com/42wim/matterbridge/bridge/helper" - "github.com/Rhymen/go-whatsapp" - "github.com/jpillora/backoff" -) -/* -Implement handling messages coming from WhatsApp -Check: -- https://github.com/Rhymen/go-whatsapp#add-message-handlers -- https://github.com/Rhymen/go-whatsapp/blob/master/handler.go -- https://github.com/tulir/mautrix-whatsapp/tree/master/whatsapp-ext for more advanced command handling -*/ - -// HandleError received from WhatsApp -func (b *Bwhatsapp) HandleError(err error) { - // ignore received invalid data errors. https://github.com/42wim/matterbridge/issues/843 - // ignore tag 174 errors. https://github.com/42wim/matterbridge/issues/1094 - if strings.Contains(err.Error(), "error processing data: received invalid data") || - strings.Contains(err.Error(), "invalid string with tag 174") { - return - } + "go.mau.fi/whatsmeow/binary/proto" + "go.mau.fi/whatsmeow/types" + "go.mau.fi/whatsmeow/types/events" +) - switch err.(type) { - case *whatsapp.ErrConnectionClosed, *whatsapp.ErrConnectionFailed: - b.reconnect(err) - default: - switch err { - case whatsapp.ErrConnectionTimeout: - b.reconnect(err) - default: - b.Log.Errorf("%v", err) - } +// nolint:gocritic +func (b *Bwhatsapp) eventHandler(evt interface{}) { + switch e := evt.(type) { + case *events.Message: + b.handleMessage(e) } } -func (b *Bwhatsapp) reconnect(err error) { - bf := &backoff.Backoff{ - Min: time.Second, - Max: 5 * time.Minute, - Jitter: true, +func (b *Bwhatsapp) handleMessage(message *events.Message) { + msg := message.Message + switch { + case msg == nil, message.Info.IsFromMe, message.Info.Timestamp.Before(b.startedAt): + return } - for { - d := bf.Duration() - - b.Log.Errorf("Connection failed, underlying error: %v", err) - b.Log.Infof("Waiting %s...", d) - - time.Sleep(d) - - b.Log.Info("Reconnecting...") - - err := b.conn.Restore() - if err == nil { - bf.Reset() - b.startedAt = uint64(time.Now().Unix()) - - return - } + switch { + case msg.Conversation != nil || msg.ExtendedTextMessage != nil: + b.handleTextMessage(message.Info, msg) + case msg.VideoMessage != nil: + b.handleVideoMessage(message) + case msg.AudioMessage != nil: + b.handleAudioMessage(message) + case msg.DocumentMessage != nil: + b.handleDocumentMessage(message) + case msg.ImageMessage != nil: + b.handleImageMessage(message) } } -// HandleTextMessage sent from WhatsApp, relay it to the brige -func (b *Bwhatsapp) HandleTextMessage(message whatsapp.TextMessage) { - if message.Info.FromMe { - return +func (b *Bwhatsapp) handleTextMessage(messageInfo types.MessageInfo, msg *proto.Message) { + senderJID := messageInfo.Sender + + senderName := b.getSenderName(messageInfo.Sender) + if senderName == "" { + senderName = "Someone" // don't expose telephone number } - // whatsapp sends last messages to show context , cut them - if message.Info.Timestamp < b.startedAt { + + if msg.GetExtendedTextMessage() == nil { return } - groupJID := message.Info.RemoteJid - senderJID := message.Info.SenderJid - - if len(senderJID) == 0 { - if message.Info.Source != nil && message.Info.Source.Participant != nil { - senderJID = *message.Info.Source.Participant - } - } + text := msg.GetExtendedTextMessage().GetText() + ci := msg.GetExtendedTextMessage().GetContextInfo() - // translate sender's JID to the nicest username we can get - senderName := b.getSenderName(senderJID) - if senderName == "" { - senderName = "Someone" // don't expose telephone number + if senderJID == (types.JID{}) && ci.Participant != nil { + senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer) } - extText := message.Info.Source.Message.ExtendedTextMessage - if extText != nil && extText.ContextInfo != nil && extText.ContextInfo.MentionedJid != nil { + if ci.MentionedJid != nil { // handle user mentions - for _, mentionedJID := range extText.ContextInfo.MentionedJid { + for _, mentionedJID := range ci.MentionedJid { numberAndSuffix := strings.SplitN(mentionedJID, "@", 2) // mentions comes as telephone numbers and we don't want to expose it to other bridges // replace it with something more meaninful to others - mention := b.getSenderNotify(numberAndSuffix[0] + "@s.whatsapp.net") + mention := b.getSenderNotify(types.NewJID(numberAndSuffix[0], types.DefaultUserServer)) if mention == "" { mention = "someone" } - message.Text = strings.Replace(message.Text, "@"+numberAndSuffix[0], "@"+mention, 1) + text = strings.Replace(text, "@"+numberAndSuffix[0], "@"+mention, 1) } } rmsg := config.Message{ - UserID: senderJID, + UserID: senderJID.String(), Username: senderName, - Text: message.Text, - Channel: groupJID, + Text: msg.GetExtendedTextMessage().GetText(), + Channel: ci.GetRemoteJid(), Account: b.Account, Protocol: b.Protocol, Extra: make(map[string][]interface{}), - // ParentID: TODO, // TODO handle thread replies // map from Info.QuotedMessageID string - ID: message.Info.Id, + // ParentID: TODO, // TODO handle thread replies // map from Info.QuotedMessageID string + ID: messageInfo.ID, } - if avatarURL, exists := b.userAvatars[senderJID]; exists { + if avatarURL, exists := b.userAvatars[senderJID.String()]; exists { rmsg.Avatar = avatarURL } @@ -134,36 +100,32 @@ func (b *Bwhatsapp) HandleTextMessage(message whatsapp.TextMessage) { } // HandleImageMessage sent from WhatsApp, relay it to the brige -func (b *Bwhatsapp) HandleImageMessage(message whatsapp.ImageMessage) { - if message.Info.FromMe || message.Info.Timestamp < b.startedAt { - return - } +func (b *Bwhatsapp) handleImageMessage(msg *events.Message) { + imsg := msg.Message.GetImageMessage() - senderJID := message.Info.SenderJid - if len(message.Info.SenderJid) == 0 && message.Info.Source != nil && message.Info.Source.Participant != nil { - senderJID = *message.Info.Source.Participant - } + senderJID := msg.Info.Sender + senderName := b.getSenderName(senderJID) + ci := imsg.GetContextInfo() - senderName := b.getSenderName(message.Info.SenderJid) - if senderName == "" { - senderName = "Someone" // don't expose telephone number + if senderJID == (types.JID{}) && ci.Participant != nil { + senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer) } rmsg := config.Message{ - UserID: senderJID, + UserID: senderJID.String(), Username: senderName, - Channel: message.Info.RemoteJid, + Channel: ci.GetRemoteJid(), Account: b.Account, Protocol: b.Protocol, Extra: make(map[string][]interface{}), - ID: message.Info.Id, + ID: msg.Info.ID, } - if avatarURL, exists := b.userAvatars[senderJID]; exists { + if avatarURL, exists := b.userAvatars[senderJID.String()]; exists { rmsg.Avatar = avatarURL } - fileExt, err := mime.ExtensionsByType(message.Type) + fileExt, err := mime.ExtensionsByType(imsg.GetMimetype()) if err != nil { b.Log.Errorf("Mimetype detection error: %s", err) @@ -180,11 +142,11 @@ func (b *Bwhatsapp) HandleImageMessage(message whatsapp.ImageMessage) { fileExt[0] = ".jpg" } - filename := fmt.Sprintf("%v%v", message.Info.Id, fileExt[0]) + filename := fmt.Sprintf("%v%v", msg.Info.ID, fileExt[0]) - b.Log.Debugf("Trying to download %s with type %s", filename, message.Type) + b.Log.Debugf("Trying to download %s with type %s", filename, imsg.GetMimetype()) - data, err := message.Download() + data, err := b.wc.Download(imsg) if err != nil { b.Log.Errorf("Download image failed: %s", err) @@ -192,7 +154,7 @@ func (b *Bwhatsapp) HandleImageMessage(message whatsapp.ImageMessage) { } // Move file to bridge storage - helper.HandleDownloadData(b.Log, &rmsg, filename, message.Caption, "", &data, b.General) + helper.HandleDownloadData(b.Log, &rmsg, filename, imsg.GetCaption(), "", &data, b.General) b.Log.Debugf("<= Sending message from %s on %s to gateway", senderJID, b.Account) b.Log.Debugf("<= Message is %#v", rmsg) @@ -201,36 +163,32 @@ func (b *Bwhatsapp) HandleImageMessage(message whatsapp.ImageMessage) { } // HandleVideoMessage downloads video messages -func (b *Bwhatsapp) HandleVideoMessage(message whatsapp.VideoMessage) { - if message.Info.FromMe || message.Info.Timestamp < b.startedAt { - return - } +func (b *Bwhatsapp) handleVideoMessage(msg *events.Message) { + imsg := msg.Message.GetVideoMessage() - senderJID := message.Info.SenderJid - if len(message.Info.SenderJid) == 0 && message.Info.Source != nil && message.Info.Source.Participant != nil { - senderJID = *message.Info.Source.Participant - } + senderJID := msg.Info.Sender + senderName := b.getSenderName(senderJID) + ci := imsg.GetContextInfo() - senderName := b.getSenderName(message.Info.SenderJid) - if senderName == "" { - senderName = "Someone" // don't expose telephone number + if senderJID == (types.JID{}) && ci.Participant != nil { + senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer) } rmsg := config.Message{ - UserID: senderJID, + UserID: senderJID.String(), Username: senderName, - Channel: message.Info.RemoteJid, + Channel: ci.GetRemoteJid(), Account: b.Account, Protocol: b.Protocol, Extra: make(map[string][]interface{}), - ID: message.Info.Id, + ID: msg.Info.ID, } - if avatarURL, exists := b.userAvatars[senderJID]; exists { + if avatarURL, exists := b.userAvatars[senderJID.String()]; exists { rmsg.Avatar = avatarURL } - fileExt, err := mime.ExtensionsByType(message.Type) + fileExt, err := mime.ExtensionsByType(imsg.GetMimetype()) if err != nil { b.Log.Errorf("Mimetype detection error: %s", err) @@ -241,11 +199,11 @@ func (b *Bwhatsapp) HandleVideoMessage(message whatsapp.VideoMessage) { fileExt = append(fileExt, ".mp4") } - filename := fmt.Sprintf("%v%v", message.Info.Id, fileExt[0]) + filename := fmt.Sprintf("%v%v", msg.Info.ID, fileExt[0]) - b.Log.Debugf("Trying to download %s with size %#v and type %s", filename, message.Length, message.Type) + b.Log.Debugf("Trying to download %s with size %#v and type %s", filename, imsg.GetFileLength(), imsg.GetMimetype()) - data, err := message.Download() + data, err := b.wc.Download(imsg) if err != nil { b.Log.Errorf("Download video failed: %s", err) @@ -253,7 +211,7 @@ func (b *Bwhatsapp) HandleVideoMessage(message whatsapp.VideoMessage) { } // Move file to bridge storage - helper.HandleDownloadData(b.Log, &rmsg, filename, message.Caption, "", &data, b.General) + helper.HandleDownloadData(b.Log, &rmsg, filename, imsg.GetCaption(), "", &data, b.General) b.Log.Debugf("<= Sending message from %s on %s to gateway", senderJID, b.Account) b.Log.Debugf("<= Message is %#v", rmsg) @@ -262,36 +220,32 @@ func (b *Bwhatsapp) HandleVideoMessage(message whatsapp.VideoMessage) { } // HandleAudioMessage downloads audio messages -func (b *Bwhatsapp) HandleAudioMessage(message whatsapp.AudioMessage) { - if message.Info.FromMe || message.Info.Timestamp < b.startedAt { - return - } +func (b *Bwhatsapp) handleAudioMessage(msg *events.Message) { + imsg := msg.Message.GetAudioMessage() - senderJID := message.Info.SenderJid - if len(message.Info.SenderJid) == 0 && message.Info.Source != nil && message.Info.Source.Participant != nil { - senderJID = *message.Info.Source.Participant - } + senderJID := msg.Info.Sender + senderName := b.getSenderName(senderJID) + ci := imsg.GetContextInfo() - senderName := b.getSenderName(message.Info.SenderJid) - if senderName == "" { - senderName = "Someone" // don't expose telephone number + if senderJID == (types.JID{}) && ci.Participant != nil { + senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer) } rmsg := config.Message{ - UserID: senderJID, + UserID: senderJID.String(), Username: senderName, - Channel: message.Info.RemoteJid, + Channel: ci.GetRemoteJid(), Account: b.Account, Protocol: b.Protocol, Extra: make(map[string][]interface{}), - ID: message.Info.Id, + ID: msg.Info.ID, } - if avatarURL, exists := b.userAvatars[senderJID]; exists { + if avatarURL, exists := b.userAvatars[senderJID.String()]; exists { rmsg.Avatar = avatarURL } - fileExt, err := mime.ExtensionsByType(message.Type) + fileExt, err := mime.ExtensionsByType(imsg.GetMimetype()) if err != nil { b.Log.Errorf("Mimetype detection error: %s", err) @@ -302,13 +256,13 @@ func (b *Bwhatsapp) HandleAudioMessage(message whatsapp.AudioMessage) { fileExt = append(fileExt, ".ogg") } - filename := fmt.Sprintf("%v%v", message.Info.Id, fileExt[0]) + filename := fmt.Sprintf("%v%v", msg.Info.ID, fileExt[0]) - b.Log.Debugf("Trying to download %s with size %#v and type %s", filename, message.Length, message.Type) + b.Log.Debugf("Trying to download %s with size %#v and type %s", filename, imsg.GetFileLength(), imsg.GetMimetype()) - data, err := message.Download() + data, err := b.wc.Download(imsg) if err != nil { - b.Log.Errorf("Download audio failed: %s", err) + b.Log.Errorf("Download video failed: %s", err) return } @@ -323,47 +277,43 @@ func (b *Bwhatsapp) HandleAudioMessage(message whatsapp.AudioMessage) { } // HandleDocumentMessage downloads documents -func (b *Bwhatsapp) HandleDocumentMessage(message whatsapp.DocumentMessage) { - if message.Info.FromMe || message.Info.Timestamp < b.startedAt { - return - } +func (b *Bwhatsapp) handleDocumentMessage(msg *events.Message) { + imsg := msg.Message.GetDocumentMessage() - senderJID := message.Info.SenderJid - if len(message.Info.SenderJid) == 0 && message.Info.Source != nil && message.Info.Source.Participant != nil { - senderJID = *message.Info.Source.Participant - } + senderJID := msg.Info.Sender + senderName := b.getSenderName(senderJID) + ci := imsg.GetContextInfo() - senderName := b.getSenderName(message.Info.SenderJid) - if senderName == "" { - senderName = "Someone" // don't expose telephone number + if senderJID == (types.JID{}) && ci.Participant != nil { + senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer) } rmsg := config.Message{ - UserID: senderJID, + UserID: senderJID.String(), Username: senderName, - Channel: message.Info.RemoteJid, + Channel: ci.GetRemoteJid(), Account: b.Account, Protocol: b.Protocol, Extra: make(map[string][]interface{}), - ID: message.Info.Id, + ID: msg.Info.ID, } - if avatarURL, exists := b.userAvatars[senderJID]; exists { + if avatarURL, exists := b.userAvatars[senderJID.String()]; exists { rmsg.Avatar = avatarURL } - fileExt, err := mime.ExtensionsByType(message.Type) + fileExt, err := mime.ExtensionsByType(imsg.GetMimetype()) if err != nil { b.Log.Errorf("Mimetype detection error: %s", err) return } - filename := fmt.Sprintf("%v", message.FileName) + filename := fmt.Sprintf("%v", imsg.GetFileName()) - b.Log.Debugf("Trying to download %s with extension %s and type %s", filename, fileExt, message.Type) + b.Log.Debugf("Trying to download %s with extension %s and type %s", filename, fileExt, imsg.GetMimetype()) - data, err := message.Download() + data, err := b.wc.Download(imsg) if err != nil { b.Log.Errorf("Download document message failed: %s", err) diff --git a/bridge/whatsapp/helpers.go b/bridge/whatsapp/helpers.go index e424387d..030dc2b4 100644 --- a/bridge/whatsapp/helpers.go +++ b/bridge/whatsapp/helpers.go @@ -1,15 +1,12 @@ package bwhatsapp import ( - "encoding/gob" - "encoding/json" - "errors" "fmt" - "os" "strings" - qrcodeTerminal "github.com/Baozisoftware/qrcode-terminal-go" - "github.com/Rhymen/go-whatsapp" + "go.mau.fi/whatsmeow/store" + "go.mau.fi/whatsmeow/store/sqlstore" + "go.mau.fi/whatsmeow/types" ) type ProfilePicInfo struct { @@ -18,141 +15,71 @@ type ProfilePicInfo struct { Status int16 `json:"status"` } -func qrFromTerminal(invert bool) chan string { - qr := make(chan string) - - go func() { - terminal := qrcodeTerminal.New() - - if invert { - terminal = qrcodeTerminal.New2(qrcodeTerminal.ConsoleColors.BrightWhite, qrcodeTerminal.ConsoleColors.BrightBlack, qrcodeTerminal.QRCodeRecoveryLevels.Medium) +func (b *Bwhatsapp) getSenderName(senderJid types.JID) string { + if sender, exists := b.contacts[senderJid]; exists { + if sender.FullName != "" { + return sender.FullName + } + // if user is not in phone contacts + // it is the most obvious scenario unless you sync your phone contacts with some remote updated source + // users can change it in their WhatsApp settings -> profile -> click on Avatar + if sender.PushName != "" { + return sender.PushName } - terminal.Get(<-qr).Print() - }() - - return qr -} - -func (b *Bwhatsapp) readSession() (whatsapp.Session, error) { - session := whatsapp.Session{} - sessionFile := b.Config.GetString(sessionFile) - - if sessionFile == "" { - return session, errors.New("if you won't set SessionFile then you will need to scan QR code on every restart") - } - - file, err := os.Open(sessionFile) - if err != nil { - return session, err - } - - defer file.Close() - - decoder := gob.NewDecoder(file) - - return session, decoder.Decode(&session) -} - -func (b *Bwhatsapp) writeSession(session whatsapp.Session) error { - sessionFile := b.Config.GetString(sessionFile) - - if sessionFile == "" { - // we already sent a warning while starting the bridge, so let's be quiet here - return nil + if sender.FirstName != "" { + return sender.FirstName + } } - file, err := os.Create(sessionFile) - if err != nil { - return err + // try to reload this contact + if _, err := b.wc.Store.Contacts.GetAllContacts(); err != nil { + b.Log.Errorf("error on update of contacts: %v", err) } - defer file.Close() - - encoder := gob.NewEncoder(file) - - return encoder.Encode(session) -} - -func (b *Bwhatsapp) restoreSession() (*whatsapp.Session, error) { - session, err := b.readSession() + allcontacts, err := b.wc.Store.Contacts.GetAllContacts() if err != nil { - b.Log.Warn(err.Error()) + b.Log.Errorf("error on update of contacts: %v", err) } - b.Log.Debugln("Restoring WhatsApp session..") - - session, err = b.conn.RestoreWithSession(session) - if err != nil { - // restore session connection timed out (I couldn't get over it without logging in again) - return nil, errors.New("failed to restore session: " + err.Error()) + if len(allcontacts) > 0 { + b.contacts = allcontacts } - b.Log.Debugln("Session restored successfully!") - - return &session, nil -} - -func (b *Bwhatsapp) getSenderName(senderJid string) string { - if sender, exists := b.users[senderJid]; exists { - if sender.Name != "" { - return sender.Name + if sender, exists := b.contacts[senderJid]; exists { + if sender.FullName != "" { + return sender.FullName } // if user is not in phone contacts // it is the most obvious scenario unless you sync your phone contacts with some remote updated source // users can change it in their WhatsApp settings -> profile -> click on Avatar - if sender.Notify != "" { - return sender.Notify + if sender.PushName != "" { + return sender.PushName } - if sender.Short != "" { - return sender.Short + if sender.FirstName != "" { + return sender.FirstName } } - // try to reload this contact - _, err := b.conn.Contacts() - if err != nil { - b.Log.Errorf("error on update of contacts: %v", err) - } - - if contact, exists := b.conn.Store.Contacts[senderJid]; exists { - // Add it to the user map - b.users[senderJid] = contact - - if contact.Name != "" { - return contact.Name - } - // if user is not in phone contacts - // same as above - return contact.Notify - } - - return "" + return "Someone" } -func (b *Bwhatsapp) getSenderNotify(senderJid string) string { - if sender, exists := b.users[senderJid]; exists { - return sender.Notify +func (b *Bwhatsapp) getSenderNotify(senderJid types.JID) string { + if sender, exists := b.contacts[senderJid]; exists { + return sender.PushName } return "" } -func (b *Bwhatsapp) GetProfilePicThumb(jid string) (*ProfilePicInfo, error) { - data, err := b.conn.GetProfilePicThumb(jid) +func (b *Bwhatsapp) GetProfilePicThumb(jid string) (*types.ProfilePictureInfo, error) { + pjid, _ := types.ParseJID(jid) + info, err := b.wc.GetProfilePictureInfo(pjid, true) if err != nil { return nil, fmt.Errorf("failed to get avatar: %v", err) } - content := <-data - info := &ProfilePicInfo{} - - err = json.Unmarshal([]byte(content), info) - if err != nil { - return info, fmt.Errorf("failed to unmarshal avatar info: %v", err) - } - return info, nil } @@ -161,3 +88,19 @@ func isGroupJid(identifier string) bool { strings.HasSuffix(identifier, "@temp") || strings.HasSuffix(identifier, "@broadcast") } + +func (b *Bwhatsapp) getDevice() (*store.Device, error) { + device := &store.Device{} + + storeContainer, err := sqlstore.New("sqlite", "file:"+b.Config.GetString("sessionfile")+".db?_foreign_keys=on", nil) + if err != nil { + return device, fmt.Errorf("failed to connect to database: %v", err) + } + + device, err = storeContainer.GetFirstDevice() + if err != nil { + return device, fmt.Errorf("failed to get device: %v", err) + } + + return device, nil +} diff --git a/bridge/whatsapp/whatsapp.go b/bridge/whatsapp/whatsapp.go index ba0ede64..a9db6a1f 100644 --- a/bridge/whatsapp/whatsapp.go +++ b/bridge/whatsapp/whatsapp.go @@ -1,38 +1,41 @@ package bwhatsapp import ( - "bytes" - "crypto/rand" - "encoding/hex" + "context" "errors" "fmt" "mime" "os" "path/filepath" - "strings" "time" "github.com/42wim/matterbridge/bridge" "github.com/42wim/matterbridge/bridge/config" - "github.com/Rhymen/go-whatsapp" + "github.com/mdp/qrterminal" + + "go.mau.fi/whatsmeow" + "go.mau.fi/whatsmeow/binary/proto" + "go.mau.fi/whatsmeow/types" + waLog "go.mau.fi/whatsmeow/util/log" + + goproto "google.golang.org/protobuf/proto" + + _ "modernc.org/sqlite" // needed for sqlite ) const ( // Account config parameters - cfgNumber = "Number" - qrOnWhiteTerminal = "QrOnWhiteTerminal" - sessionFile = "SessionFile" + cfgNumber = "Number" ) // Bwhatsapp Bridge structure keeping all the information needed for relying type Bwhatsapp struct { *bridge.Config - session *whatsapp.Session - conn *whatsapp.Conn - startedAt uint64 - - users map[string]whatsapp.Contact + startedAt time.Time + wc *whatsmeow.Client + contacts map[types.JID]types.ContactInfo + users map[string]types.ContactInfo userAvatars map[string]string } @@ -47,7 +50,7 @@ func New(cfg *bridge.Config) bridge.Bridger { b := &Bwhatsapp{ Config: cfg, - users: make(map[string]whatsapp.Contact), + users: make(map[string]types.ContactInfo), userAvatars: make(map[string]string), } @@ -56,54 +59,56 @@ func New(cfg *bridge.Config) bridge.Bridger { // Connect to WhatsApp. Required implementation of the Bridger interface func (b *Bwhatsapp) Connect() error { + device, err := b.getDevice() + if err != nil { + return err + } + number := b.GetString(cfgNumber) if number == "" { return errors.New("whatsapp's telephone number need to be configured") } b.Log.Debugln("Connecting to WhatsApp..") - conn, err := whatsapp.NewConn(20 * time.Second) - if err != nil { - return errors.New("failed to connect to WhatsApp: " + err.Error()) - } - b.conn = conn + b.wc = whatsmeow.NewClient(device, waLog.Stdout("Client", "INFO", true)) + b.wc.AddEventHandler(b.eventHandler) - b.conn.AddHandler(b) - b.Log.Debugln("WhatsApp connection successful") + // No ID stored, new login + qrChan, err := b.wc.GetQRChannel(context.Background()) + // This error means that we're already logged in, so ignore it. + if err != nil && !errors.Is(err, whatsmeow.ErrQRStoreContainsID) { + return errors.New("failed to to get QR channel:" + err.Error()) + } - // load existing session in order to keep it between restarts - b.session, err = b.restoreSession() + err = b.wc.Connect() if err != nil { - b.Log.Warn(err.Error()) + return errors.New("failed to connect to WhatsApp: " + err.Error()) } - // login to a new session - if b.session == nil { - if err = b.Login(); err != nil { - return err + for evt := range qrChan { + if evt.Event == "code" { + // Render the QR code here + qrterminal.GenerateHalfBlock(evt.Code, qrterminal.L, os.Stdout) + } else { + b.Log.Infof("QR channel result: %s", evt.Event) } } - b.startedAt = uint64(time.Now().Unix()) + b.Log.Infoln("WhatsApp connection successful") - _, err = b.conn.Contacts() + b.contacts, err = b.wc.Store.Contacts.GetAllContacts() if err != nil { - return fmt.Errorf("error on update of contacts: %v", err) + return errors.New("failed to get contacts: " + err.Error()) } - // see https://github.com/Rhymen/go-whatsapp/issues/137#issuecomment-480316013 - for len(b.conn.Store.Contacts) == 0 { - b.conn.Contacts() // nolint:errcheck - - <-time.After(1 * time.Second) - } + b.startedAt = time.Now() // map all the users - for id, contact := range b.conn.Store.Contacts { - if !isGroupJid(id) && id != "status@broadcast" { + for id, contact := range b.contacts { + if !isGroupJid(id.String()) && id.String() != "status@broadcast" { // it is user - b.users[id] = contact + b.users[id.String()] = contact } } @@ -128,38 +133,11 @@ func (b *Bwhatsapp) Connect() error { return nil } -// Login to WhatsApp creating a new session. This will require to scan a QR code on your mobile device -func (b *Bwhatsapp) Login() error { - b.Log.Debugln("Logging in..") - - invert := b.GetBool(qrOnWhiteTerminal) // false is the default - qrChan := qrFromTerminal(invert) - - session, err := b.conn.Login(qrChan) - if err != nil { - b.Log.Warnln("Failed to log in:", err) - - return err - } - - b.session = &session - - b.Log.Infof("Logged into session: %#v", session) - b.Log.Infof("Connection: %#v", b.conn) - - err = b.writeSession(session) - if err != nil { - fmt.Fprintf(os.Stderr, "error saving session: %v\n", err) - } - - return nil -} - // Disconnect is called while reconnecting to the bridge // Required implementation of the Bridger interface func (b *Bwhatsapp) Disconnect() error { - // We could Logout, but that would close the session completely and would require a new QR code scan - // https://github.com/Rhymen/go-whatsapp/blob/c31092027237441cffba1b9cb148eadf7c83c3d2/session.go#L377-L381 + b.wc.Disconnect() + return nil } @@ -169,16 +147,19 @@ func (b *Bwhatsapp) Disconnect() error { func (b *Bwhatsapp) JoinChannel(channel config.ChannelInfo) error { byJid := isGroupJid(channel.Name) - // see https://github.com/Rhymen/go-whatsapp/issues/137#issuecomment-480316013 - for len(b.conn.Store.Contacts) == 0 { - b.conn.Contacts() // nolint:errcheck - <-time.After(1 * time.Second) - } - // verify if we are member of the given group if byJid { + gJID, err := types.ParseJID(channel.Name) + if err != nil { + return err + } // channel.Name specifies static group jID, not the name - if _, exists := b.conn.Store.Contacts[channel.Name]; !exists { + info, err := b.wc.Store.Contacts.GetContact(gJID) + if err != nil { + return err + } + + if !info.Found { return fmt.Errorf("account doesn't belong to group with jid %s", channel.Name) } @@ -187,18 +168,22 @@ func (b *Bwhatsapp) JoinChannel(channel config.ChannelInfo) error { // channel.Name specifies group name that might change, warn about it var jids []string - for id, contact := range b.conn.Store.Contacts { - if isGroupJid(id) && contact.Name == channel.Name { - jids = append(jids, id) + allContacts, err := b.wc.Store.Contacts.GetAllContacts() + if err != nil { + return err + } + for id := range allContacts { + if isGroupJid(id.String()) && id.String() == channel.Name { + jids = append(jids, id.String()) } } switch len(jids) { case 0: // didn't match any group - print out possibilites - for id, contact := range b.conn.Store.Contacts { - if isGroupJid(id) { - b.Log.Infof("%s %s", contact.Jid, contact.Name) + for id, contact := range allContacts { + if isGroupJid(id.String()) { + b.Log.Infof("%s %s", id, contact.FullName) } } @@ -212,68 +197,75 @@ func (b *Bwhatsapp) JoinChannel(channel config.ChannelInfo) error { // Post a document message from the bridge to WhatsApp func (b *Bwhatsapp) PostDocumentMessage(msg config.Message, filetype string) (string, error) { + groupJID, _ := types.ParseJID(msg.Channel) + fi := msg.Extra["file"][0].(config.FileInfo) + resp, err := b.wc.Upload(context.Background(), *fi.Data, whatsmeow.MediaDocument) + if err != nil { + return "", err + } + // Post document message - message := whatsapp.DocumentMessage{ - Info: whatsapp.MessageInfo{ - RemoteJid: msg.Channel, - }, - Title: fi.Name, - FileName: fi.Name, - Type: filetype, - Content: bytes.NewReader(*fi.Data), + var message proto.Message + + message.DocumentMessage = &proto.DocumentMessage{ + Title: &fi.Name, + FileName: &fi.Name, + Mimetype: &filetype, + MediaKey: resp.MediaKey, + FileEncSha256: resp.FileEncSHA256, + FileSha256: resp.FileSHA256, + FileLength: goproto.Uint64(resp.FileLength), + Url: &resp.URL, } b.Log.Debugf("=> Sending %#v", msg) - // create message ID - // TODO follow and act if https://github.com/Rhymen/go-whatsapp/issues/101 implemented - idBytes := make([]byte, 10) - if _, err := rand.Read(idBytes); err != nil { - b.Log.Warn(err.Error()) - } - - message.Info.Id = strings.ToUpper(hex.EncodeToString(idBytes)) - _, err := b.conn.Send(message) + ID := whatsmeow.GenerateMessageID() + _, err = b.wc.SendMessage(groupJID, ID, &message) - return message.Info.Id, err + return ID, err } // Post an image message from the bridge to WhatsApp // Handle, for sure image/jpeg, image/png and image/gif MIME types func (b *Bwhatsapp) PostImageMessage(msg config.Message, filetype string) (string, error) { + groupJID, _ := types.ParseJID(msg.Channel) + fi := msg.Extra["file"][0].(config.FileInfo) - // Post image message - message := whatsapp.ImageMessage{ - Info: whatsapp.MessageInfo{ - RemoteJid: msg.Channel, - }, - Type: filetype, - Caption: msg.Username + fi.Comment, - Content: bytes.NewReader(*fi.Data), + caption := msg.Username + fi.Comment + + resp, err := b.wc.Upload(context.Background(), *fi.Data, whatsmeow.MediaImage) + if err != nil { + return "", err } - b.Log.Debugf("=> Sending %#v", msg) + var message proto.Message - // create message ID - // TODO follow and act if https://github.com/Rhymen/go-whatsapp/issues/101 implemented - idBytes := make([]byte, 10) - if _, err := rand.Read(idBytes); err != nil { - b.Log.Warn(err.Error()) + message.ImageMessage = &proto.ImageMessage{ + Mimetype: &filetype, + Caption: &caption, + MediaKey: resp.MediaKey, + FileEncSha256: resp.FileEncSHA256, + FileSha256: resp.FileSHA256, + FileLength: goproto.Uint64(resp.FileLength), + Url: &resp.URL, } - message.Info.Id = strings.ToUpper(hex.EncodeToString(idBytes)) - _, err := b.conn.Send(message) + b.Log.Debugf("=> Sending %#v", msg) + + ID := whatsmeow.GenerateMessageID() + _, err = b.wc.SendMessage(groupJID, ID, &message) - return message.Info.Id, err + return ID, err } // Send a message from the bridge to WhatsApp -// Required implementation of the Bridger interface -// https://github.com/42wim/matterbridge/blob/2cfd880cdb0df29771bf8f31df8d990ab897889d/bridge/bridge.go#L11-L16 func (b *Bwhatsapp) Send(msg config.Message) (string, error) { + groupJID, _ := types.ParseJID(msg.Channel) + b.Log.Debugf("=> Receiving %#v", msg) // Delete message @@ -284,7 +276,7 @@ func (b *Bwhatsapp) Send(msg config.Message) (string, error) { return "", nil } - _, err := b.conn.RevokeMessage(msg.Channel, msg.ID, true) + _, err := b.wc.RevokeMessage(groupJID, msg.ID) return "", err } @@ -317,20 +309,18 @@ func (b *Bwhatsapp) Send(msg config.Message) (string, error) { } } - // Post text message - message := whatsapp.TextMessage{ - Info: whatsapp.MessageInfo{ - RemoteJid: msg.Channel, // which equals to group id - }, - Text: msg.Username + msg.Text, + var message proto.Message + + text := msg.Username + msg.Text + + message.ExtendedTextMessage = &proto.ExtendedTextMessage{ + Text: &text, } b.Log.Debugf("=> Sending %#v", msg) - return b.conn.Send(message) -} + ID := whatsmeow.GenerateMessageID() + _, err := b.wc.SendMessage(groupJID, ID, &message) -// TODO do we want that? to allow login with QR code from a bridged channel? https://github.com/tulir/mautrix-whatsapp/blob/513eb18e2d59bada0dd515ee1abaaf38a3bfe3d5/commands.go#L76 -//func (b *Bwhatsapp) Command(cmd string) string { -// return "" -//} + return ID, err +} -- cgit v1.2.3