Add message type and space id in files

.github/CODEOWNERS

@@ -1,3 +1,3 @@
-*         @kleewho @parfeon @mateusz-dahlke
+*         @kleewho @parfeon @Xavrax
 .github/* @parfeon @kleewho
 README.md @techwritermat @kazydek

.gitignore

@@ -2,6 +2,7 @@
 *.o
 *.a
 *.so
+*.env
 
 # Folders
 _obj

files_send_file.go

@@ -48,6 +48,18 @@ func (b *sendFileBuilder) Meta(meta interface{}) *sendFileBuilder {
 	return b
 }
 
+func (b *sendFileBuilder) SpaceId(id SpaceId) *sendFileBuilder {
+	b.opts.SpaceId = id
+
+	return b
+}
+
+func (b *sendFileBuilder) MessageType(messageType MessageType) *sendFileBuilder {
+	b.opts.MessageType = messageType
+
+	return b
+}
+
 // ShouldStore if true the messages are stored in History
 func (b *sendFileBuilder) ShouldStore(store bool) *sendFileBuilder {
 	b.opts.ShouldStore = store
@@ -117,6 +129,8 @@ type sendFileOpts struct {
 	CipherKey   string
 	TTL         int
 	Meta        interface{}
+	SpaceId     SpaceId
+	MessageType MessageType
 	ShouldStore bool
 	QueryParam  map[string]string
 
@@ -236,7 +250,15 @@ func newPNSendFileResponse(jsonBytes []byte, o *sendFileOpts,
 	maxCount := o.config().FileMessagePublishRetryLimit
 	for !sent && tryCount < maxCount {
 		tryCount++
-		pubFileMessageResponse, pubFileResponseStatus, errPubFileResponse := o.pubnub.PublishFileMessage().TTL(o.TTL).Meta(o.Meta).ShouldStore(o.ShouldStore).Channel(o.Channel).Message(message).Execute()
+		pubFileMessageResponse, pubFileResponseStatus, errPubFileResponse := o.pubnub.PublishFileMessage().
+			TTL(o.TTL).
+			Meta(o.Meta).
+			ShouldStore(o.ShouldStore).
+			Channel(o.Channel).
+			Message(message).
+			MessageType(o.MessageType).
+			SpaceId(o.SpaceId).
+			Execute()
 		if errPubFileResponse != nil {
 			if tryCount >= maxCount {
 				pubFileResponseStatus.AdditionalData = file

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/brianolson/cbor_go v1.0.0
 	github.com/cucumber/godog v0.12.0
 	github.com/google/uuid v1.3.0
+	github.com/joho/godotenv v1.5.1 // indirect
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d
 	golang.org/x/text v0.3.7 // indirect

go.sum

@@ -112,6 +112,8 @@ github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0m
 github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I=
 github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=

listener_manager.go

@@ -362,4 +362,6 @@ type PNFilesEvent struct {
 	Subscription      string
 	Publisher         string
 	Timetoken         int64
+	MessageType       MessageType
+	SpaceId           SpaceId
 }

publish_file_message.go

@@ -51,6 +51,18 @@ func (b *publishFileMessageBuilder) Meta(meta interface{}) *publishFileMessageBu
 	return b
 }
 
+func (b *publishFileMessageBuilder) SpaceId(id SpaceId) *publishFileMessageBuilder {
+	b.opts.SpaceId = id
+
+	return b
+}
+
+func (b *publishFileMessageBuilder) MessageType(messageType MessageType) *publishFileMessageBuilder {
+	b.opts.MessageType = messageType
+
+	return b
+}
+
 // ShouldStore if true the messages are stored in History
 func (b *publishFileMessageBuilder) ShouldStore(store bool) *publishFileMessageBuilder {
 	b.opts.ShouldStore = store
@@ -129,6 +141,8 @@ type publishFileMessageOpts struct {
 	UsePost        bool
 	TTL            int
 	Meta           interface{}
+	SpaceId        SpaceId
+	MessageType    MessageType
 	ShouldStore    bool
 	setTTL         bool
 	setShouldStore bool
@@ -244,6 +258,14 @@ func (o *publishFileMessageOpts) buildPath() (string, error) {
 func (o *publishFileMessageOpts) buildQuery() (*url.Values, error) {
 	q := defaultQuery(o.pubnub.Config.UUID, o.pubnub.telemetryManager)
 
+	if o.MessageType != "" {
+		q.Set(publishMessageTypeQueryParam, string(o.MessageType))
+	}
+
+	if o.SpaceId != "" {
+		q.Set(publishSpaceIdQueryParam, string(o.SpaceId))
+	}
+
 	SetQueryParam(q, o.QueryParam)
 
 	return q, nil

publish_file_message_test.go

@@ -298,3 +298,37 @@ func TestPublishFileMessageResponseValuePass(t *testing.T) {
 
 	assert.Nil(err)
 }
+
+func TestPublishFileMessageSpaceIdQueryParamIsPassed(t *testing.T) {
+	a := assert.New(t)
+	pn := NewPubNub(NewDemoConfig())
+	expectedSpaceId := SpaceId("spaceId")
+	queryValues, _ := pn.PublishFileMessage().SpaceId(expectedSpaceId).opts.buildQuery()
+
+	a.Equal(expectedSpaceId, SpaceId(queryValues.Get(publishSpaceIdQueryParam)))
+}
+
+func TestPublishFileMessageMissingSpaceIdQueryParamIsNotSet(t *testing.T) {
+	a := assert.New(t)
+	pn := NewPubNub(NewDemoConfig())
+	queryValues, _ := pn.PublishFileMessage().opts.buildQuery()
+
+	a.Equal("", queryValues.Get(publishSpaceIdQueryParam))
+}
+
+func TestPublishFileMessageMessageTypeQueryParamIsPassed(t *testing.T) {
+	a := assert.New(t)
+	pn := NewPubNub(NewDemoConfig())
+	expectedMessageType := MessageType("customMessageType")
+	queryValues, _ := pn.PublishFileMessage().MessageType(expectedMessageType).opts.buildQuery()
+
+	a.Equal(expectedMessageType, MessageType(queryValues.Get(publishMessageTypeQueryParam)))
+}
+
+func TestPublishFileMessageMissingMessageTypeQueryParamIsNotSet(t *testing.T) {
+	a := assert.New(t)
+	pn := NewPubNub(NewDemoConfig())
+	queryValues, _ := pn.PublishFileMessage().opts.buildQuery()
+
+	a.Equal("", queryValues.Get(publishMessageTypeQueryParam))
+}

publish_request.go

@@ -134,7 +134,6 @@ func (b *publishBuilder) Meta(meta interface{}) *publishBuilder {
 
 func (b *publishBuilder) SpaceId(id SpaceId) *publishBuilder {
 	b.opts.SpaceId = id
-
 	return b
 }
 

subscription_manager.go

@@ -684,7 +684,7 @@ func processNonPresencePayload(m *SubscriptionManager, payload subscribeMessage,
 
 		}
 
-		pnFilesEvent := createPNFilesEvent(messagePayload, m, actualCh, subscribedCh, channel, subscriptionMatch, payload.IssuingClientID, payload.UserMetadata, timetoken)
+		pnFilesEvent := createPNFilesEvent(messagePayload, m, actualCh, subscribedCh, channel, subscriptionMatch, payload.IssuingClientID, payload.UserMetadata, timetoken, messageType, payload.SpaceId)
 		m.pubnub.Config.Log.Println("PNMessageTypeFile:", PNMessageTypeFile)
 		m.listenerManager.announceFile(pnFilesEvent)
 	default:
@@ -725,7 +725,7 @@ func processSubscribePayload(m *SubscriptionManager, payload subscribeMessage) {
 	}
 }
 
-func createPNFilesEvent(filePayload interface{}, m *SubscriptionManager, actualCh, subscribedCh, channel, subscriptionMatch, issuingClientID string, userMetadata interface{}, timetoken int64) *PNFilesEvent {
+func createPNFilesEvent(filePayload interface{}, m *SubscriptionManager, actualCh, subscribedCh, channel, subscriptionMatch, issuingClientID string, userMetadata interface{}, timetoken int64, messageType MessageType, spaceId SpaceId) *PNFilesEvent {
 	var filesPayload map[string]interface{}
 	var ok bool
 	if filesPayload, ok = filePayload.(map[string]interface{}); !ok {
@@ -756,6 +756,8 @@ func createPNFilesEvent(filePayload interface{}, m *SubscriptionManager, actualC
 		Timetoken:         timetoken,
 		Publisher:         issuingClientID,
 		UserMetadata:      userMetadata,
+		SpaceId:           spaceId,
+		MessageType:       messageType,
 	}
 	return pnFilesEvent
 }