singal offline push

internal/push/getui/push.go

@@ -1,6 +1,7 @@
 package getui
 
 import (
+	"Open_IM/internal/push/logic"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/common/log"
@@ -98,7 +99,7 @@ func newGetuiClient() *Getui {
 	return &Getui{}
 }
 
-func (g *Getui) Push(userIDList []string, alert, detailContent, operationID string) (resp string, err error) {
+func (g *Getui) Push(userIDList []string, alert, detailContent, operationID string, opts logic.PushOpts) (resp string, err error) {
 	token, err := db.DB.GetGetuiToken()
 	log.NewDebug(operationID, utils.GetSelfFuncName(), "token：", token)
 	if err != nil {

internal/push/jpush/push.go

@@ -3,6 +3,7 @@ package push
 import (
 	"Open_IM/internal/push/jpush/common"
 	"Open_IM/internal/push/jpush/requestBody"
+	"Open_IM/internal/push/logic"
 	"Open_IM/pkg/common/config"
 	"bytes"
 	"encoding/json"
@@ -32,13 +33,19 @@ func (j *JPush) SetAlias(cid, alias string) (resp string, err error) {
 	return resp, nil
 }
 
-func (j *JPush) Push(accounts []string, alert, detailContent, operationID string) (string, error) {
+func (j *JPush) Push(accounts []string, alert, detailContent, operationID string, opts logic.PushOpts) (string, error) {
 	var pf requestBody.Platform
 	pf.SetAll()
 	var au requestBody.Audience
 	au.SetAlias(accounts)
 	var no requestBody.Notification
 	no.SetAlert(alert)
+
+	var extras requestBody.Extras
+	if opts.Signal.ClientMsgID != "" {
+		extras.ClientMsgID = opts.Signal.ClientMsgID
+	}
+	no.SetExtras(extras)
 	var me requestBody.Message
 	me.SetMsgContent(detailContent)
 	var o requestBody.Options

internal/push/jpush/requestBody/notification.go

@@ -15,11 +15,17 @@ type Android struct {
 	Intent struct {
 		URL string `json:"url,omitempty"`
 	} `json:"intent,omitempty"`
+	Extras Extras `json:"extras"`
 }
 type Ios struct {
-	Alert string `json:"alert,omitempty"`
-	Sound string `json:"sound,omitempty"`
-	Badge string `json:"badge,omitempty"`
+	Alert  string `json:"alert,omitempty"`
+	Sound  string `json:"sound,omitempty"`
+	Badge  string `json:"badge,omitempty"`
+	Extras Extras `json:"extras"`
+}
+
+type Extras struct {
+	ClientMsgID string `json:"clientMsgID"`
 }
 
 func (n *Notification) SetAlert(alert string) {
@@ -29,8 +35,13 @@ func (n *Notification) SetAlert(alert string) {
 	n.IOS.Alert = alert
 	n.IOS.Sound = "default"
 	n.IOS.Badge = "+1"
-
 }
+
+func (n *Notification) SetExtras(extras Extras) {
+	n.IOS.Extras = extras
+	n.Android.Extras = extras
+}
+
 func (n *Notification) SetAndroidIntent() {
 	n.Android.Intent.URL = config.Config.Push.Jpns.PushIntent
 }

internal/push/logic/push_to_client.go

@@ -7,16 +7,17 @@
 package logic
 
 import (
-	jpush "Open_IM/internal/push/jpush"
 	"Open_IM/pkg/common/config"
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/log"
 	"Open_IM/pkg/grpc-etcdv3/getcdv3"
 	pbPush "Open_IM/pkg/proto/push"
 	pbRelay "Open_IM/pkg/proto/relay"
+	pbRtc "Open_IM/pkg/proto/rtc"
 	"Open_IM/pkg/utils"
 	"context"
 	"encoding/json"
+	"github.com/golang/protobuf/proto"
 	"google.golang.org/grpc"
 	"strings"
 )
@@ -35,6 +36,14 @@ type AtContent struct {
 
 var grpcCons []*grpc.ClientConn
 
+type PushOpts struct {
+	Signal Signal
+}
+
+type Signal struct {
+	ClientMsgID string
+}
+
 func MsgToUser(pushMsg *pbPush.PushMsgReq) {
 	var wsResult []*pbRelay.SingleMsgToUser
 	isOfflinePush := utils.GetSwitchFromOptions(pushMsg.MsgData.Options, constant.IsOfflinePush)
@@ -117,9 +126,13 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) {
 				}
 
 				if offlinePusher == nil {
-					offlinePusher = jpush.JPushClient
+					break
 				}
-				pushResult, err := offlinePusher.Push(UIDList, content, jsonCustomContent, pushMsg.OperationID)
+				opts, err := GetOfflinePushOpts(pushMsg)
+				if err != nil {
+					log.NewError(pushMsg.OperationID, utils.GetSelfFuncName(), "GetOfflinePushOpts failed", pushMsg, err.Error())
+				}
+				pushResult, err := offlinePusher.Push(UIDList, content, jsonCustomContent, pushMsg.OperationID, opts)
 				if err != nil {
 					log.NewError(pushMsg.OperationID, "offline push error", pushMsg.String(), err.Error())
 				} else {
@@ -133,6 +146,21 @@ func MsgToUser(pushMsg *pbPush.PushMsgReq) {
 	}
 }
 
+func GetOfflinePushOpts(pushMsg *pbPush.PushMsgReq) (opts PushOpts, err error) {
+	if pushMsg.MsgData.ContentType < constant.SignalingNotificationEnd && pushMsg.MsgData.ContentType > constant.SignalingNotification {
+		req := &pbRtc.SignalMessageAssembleReq{}
+		if err := proto.Unmarshal(pushMsg.MsgData.Content, req); err != nil {
+			return opts, err
+		}
+		switch req.SignalReq.Payload.(type) {
+		case *pbRtc.SignalReq_Invite, *pbRtc.SignalReq_InviteInGroup:
+			opts.Signal.ClientMsgID = pushMsg.MsgData.ClientMsgID
+		}
+
+	}
+	return opts, nil
+}
+
 //func SendMsgByWS(m *pbChat.WSToMsgSvrChatMsg) {
 //	m.MsgID = rpcChat.GetMsgID(m.SendID)
 //	m.ClientMsgID = m.MsgID

internal/push/push_interface.go

@@ -1,5 +1,7 @@
 package push
 
+import "Open_IM/internal/push/logic"
+
 type OfflinePusher interface {
-	Push(userIDList []string, alert, detailContent, operationID string) (resp string, err error)
+	Push(userIDList []string, alert, detailContent, operationID string, opts logic.PushOpts) (resp string, err error)
 }