fix: mark SharedConfigMessage as reserved

protos/SignalService.proto

@@ -38,22 +38,11 @@ message MessageRequestResponse {
   optional DataMessage.LokiProfile   profile                   = 3;
 }
 
-message SharedConfigMessage {
-  enum Kind {
-    USER_PROFILE              = 1;
-    CONTACTS                  = 2;
-    CONVO_INFO_VOLATILE       = 3;
-    USER_GROUPS               = 4;
-  }
-
-  required Kind              kind             = 1;
-  required int64             seqno            = 2;
-  required bytes             data             = 3;
-}
 
 message Content {
-  reserved 7;
-  reserved "configurationMessage";
+  reserved 7, 11;
+  reserved "configurationMessage", "sharedConfigMessage";
+
   optional DataMessage                dataMessage                = 1;
   optional CallMessage                callMessage                = 3;
   optional ReceiptMessage             receiptMessage             = 5;
@@ -61,13 +50,10 @@ message Content {
   optional DataExtractionNotification dataExtractionNotification = 8;
   optional Unsend                     unsendMessage              = 9;
   optional MessageRequestResponse     messageRequestResponse     = 10;
-  optional SharedConfigMessage        sharedConfigMessage        = 11;
 }
 
 message KeyPair {
-  // @required
   required bytes publicKey  = 1;
-  // @required
   required bytes privateKey = 2;
 }
 
@@ -78,18 +64,14 @@ message DataExtractionNotification {
     MEDIA_SAVED = 2; // timestamp
   }
 
-  // @required
   required Type   type      = 1;
   optional uint64 timestamp = 2;
 }
 
 message GroupUpdateInviteMessage {
-  // @required
   required string         groupSessionId         = 1; // The `groupIdentityPublicKey` with a `03` prefix
-  // @required
   required string         name                   = 2;
   required bytes          memberAuthData         = 3;
-  // @required
   required bytes          adminSignature         = 4;
 }
 
@@ -106,7 +88,6 @@ message GroupUpdateInfoChangeMessage {
     DISAPPEARING_MESSAGES = 3;
   }
 
-  // @required
   required Type     type              = 1;
   optional string   updatedName       = 2;
   optional uint32   updatedExpiration = 3;
@@ -120,7 +101,6 @@ message GroupUpdateMemberChangeMessage {
     PROMOTED = 3;
   }
 
-  // @required
   required Type   type               = 1;
   repeated string memberSessionIds   = 2;
   required bytes  adminSignature     = 3;
@@ -128,7 +108,6 @@ message GroupUpdateMemberChangeMessage {
 
 
 message GroupUpdatePromoteMessage {
-  // @required
   required bytes          groupIdentitySeed       = 1;
 }
 
@@ -137,7 +116,6 @@ message GroupUpdateMemberLeftMessage {
 }
 
 message GroupUpdateInviteResponseMessage {
-  // @required
   required bool                      isApproved                = 1; // Whether the request was approved
 }
 
@@ -175,12 +153,9 @@ message DataMessage {
         REACT = 0;
         REMOVE = 1;
     }
-    // @required
     required uint64 id        = 1; // Message timestamp
-    // @required
     required string author    = 2;
     optional string emoji     = 3;
-    // @required
     required Action action    = 4;
   }
 
@@ -192,16 +167,13 @@ message DataMessage {
       optional AttachmentPointer thumbnail   = 3;
     }
 
-    // @required
     required uint64           id          = 1;
-    // @required
     required string           author      = 2;
     optional string           text        = 3;
     repeated QuotedAttachment attachments = 4;
   }
 
   message Preview {
-    // @required
     required string            url   = 1;
     optional string            title = 2;
     optional AttachmentPointer image = 3;
@@ -213,9 +185,7 @@ message DataMessage {
   }
 
   message OpenGroupInvitation {
-    // @required
     required string url = 1;
-    // @required
     required string name = 3;
   }
 
@@ -233,13 +203,10 @@ message DataMessage {
 
 
     message KeyPairWrapper {
-      // @required
       required bytes publicKey        = 1; // The public key of the user the key pair is meant for
-      // @required
       required bytes encryptedKeyPair = 2; // The encrypted key pair
     }
 
-    // @required
     required Type           type              = 1;
     optional bytes          publicKey         = 2;
     optional string         name              = 3;
@@ -278,13 +245,11 @@ message CallMessage {
     END_CALL           = 5;
   }
 
-  // @required
   required Type type              = 1;
   repeated string sdps            = 2;
   repeated uint32 sdpMLineIndexes = 3;
   repeated string sdpMids         = 4;
 
-  // @required
   required string uuid            = 5;
 
 }

ts/receiver/contentMessage.ts

@@ -491,12 +491,6 @@ export async function innerHandleSwarmContentMessage({
       return;
     }
 
-    if (content.sharedConfigMessage) {
-      window.log.warn('content.sharedConfigMessage are handled outside of the receiving pipeline');
-      // this should never happen, but remove it from cache just in case something is messed up
-      await IncomingMessageCache.removeFromCache(envelope);
-      return;
-    }
     if (content.dataExtractionNotification) {
       perfStart(`handleDataExtractionNotification-${envelope.id}`);
 

ts/session/messages/incoming/IncomingMessage.ts

@@ -8,8 +8,7 @@ type IncomingMessageAvailableTypes =
   | SignalService.TypingMessage
   | SignalService.DataExtractionNotification
   | SignalService.Unsend
-  | SignalService.MessageRequestResponse
-  | SignalService.ISharedConfigMessage;
+  | SignalService.MessageRequestResponse;
 
 export class IncomingMessage<T extends IncomingMessageAvailableTypes> {
   public readonly envelopeTimestamp: number;

ts/test/session/unit/messages/ChatMessage_test.ts

@@ -1,4 +1,5 @@
 import { expect } from 'chai';
+// eslint-disable-next-line import/order
 import { TextEncoder } from 'util';
 
 import { toNumber } from 'lodash';