make identifier a uuid

ts/session/messages/outgoing/Message.ts

@@ -1,6 +1,7 @@
+import { v4 as uuid } from 'uuid';
+
 export interface MessageParams {
   timestamp: number;
-  identifier: string;
 }
 
 export abstract class Message {
@@ -8,12 +9,9 @@ export abstract class Message {
   public identifier: string;
 
 
-  constructor({ timestamp, identifier }: MessageParams) {
-    if (identifier.length === 0) {
-      throw new Error('Cannot set empty identifier');
-    }
+  constructor({ timestamp }: MessageParams) {
     this.timestamp = timestamp;
-    this.identifier = identifier;
+    this.identifier = uuid();
   }
 
   public setIdentifier(identifier: string) {

ts/session/messages/outgoing/OpenGroupMessage.ts

@@ -16,14 +16,13 @@ export class OpenGroupMessage extends Message {
   public readonly quote?: QuotedAttachmentType;
 
   constructor({
-      identifier,
       timestamp,
       server,
       attachments,
       body,
       quote,
     } : OpenGroupMessageParams) {
-    super({ timestamp, identifier });
+    super({ timestamp });
     this.server = server;
     this.body = body;
     this.attachments = attachments;

ts/session/messages/outgoing/content/ContentMessage.ts

@@ -3,8 +3,8 @@ import { SignalService } from '../../../../protobuf';
 
 export abstract class ContentMessage extends Message {
 
-  constructor({ timestamp, identifier }: { timestamp: number; identifier: string }) {
-    super({timestamp, identifier});
+  constructor({ timestamp }: { timestamp: number }) {
+    super({timestamp});
   }
 
   public plainTextBuffer(): Uint8Array {

ts/session/messages/outgoing/content/SessionResetMessage.ts

@@ -22,7 +22,7 @@ export class SessionResetMessage extends ContentMessage {
   private readonly preKeyBundle: PreKeyBundleType;
 
   constructor(params: SessionResetParams) {
-    super({ timestamp: params.timestamp, identifier: params.identifier });
+    super({ timestamp: params.timestamp });
     this.preKeyBundle = params.preKeyBundle;
   }
 

ts/session/messages/outgoing/content/TypingMessage.ts

@@ -15,7 +15,7 @@ export class TypingMessage extends ContentMessage {
   private readonly groupId?: string;
 
   constructor(params: TypingMessageParams) {
-    super({timestamp: params.timestamp, identifier: params.identifier});
+    super({timestamp: params.timestamp});
     this.isTyping = params.isTyping;
     this.typingTimestamp = params.typingTimestamp;
     this.groupId = params.groupId;

ts/session/messages/outgoing/content/data/GroupInvitationMessage.ts

@@ -14,7 +14,7 @@ export class GroupInvitationMessage extends DataMessage {
   private readonly serverName: string;
 
   constructor(params: GroupInvitationMessageParams) {
-    super({ timestamp: params.timestamp, identifier: params.identifier });
+    super({ timestamp: params.timestamp });
     this.serverAddress = params.serverAddress;
     this.channelId = params.channelId;
     this.serverName = params.serverName;

ts/session/messages/outgoing/content/link/DeviceLinkGrantMessage.ts

@@ -17,7 +17,6 @@ export class DeviceLinkGrantMessage extends DeviceLinkRequestMessage {
   ) {
     super({
       timestamp: params.timestamp,
-      identifier: params.identifier,
       primaryDevicePubKey: params.primaryDevicePubKey,
       secondaryDevicePubKey: params.secondaryDevicePubKey,
       requestSignature: params.requestSignature,

ts/session/messages/outgoing/content/link/DeviceLinkRequestMessage.ts

@@ -14,7 +14,7 @@ export class DeviceLinkRequestMessage extends ContentMessage {
   protected readonly requestSignature: Uint8Array;
 
   constructor(params: DeviceLinkMessageParams) {
-    super({ timestamp: params.timestamp, identifier: params.identifier });
+    super({ timestamp: params.timestamp });
     this.primaryDevicePubKey = params.primaryDevicePubKey;
     this.secondaryDevicePubKey = params.secondaryDevicePubKey;
     this.requestSignature = params.requestSignature;

ts/session/messages/outgoing/content/receipt/ReceiptMessage.ts

@@ -8,9 +8,9 @@ interface ReceiptMessageParams extends MessageParams {
 export abstract class ReceiptMessage extends ContentMessage {
   private readonly timestamps: Array<number>;
 
-  constructor({ timestamp, identifier, timestamps }:
+  constructor({ timestamp, timestamps }:
     ReceiptMessageParams) {
-    super({timestamp, identifier});
+    super({timestamp});
     this.timestamps = timestamps;
   }
 

ts/test/session/messages/DeviceLinkMessage_test.ts

@@ -13,7 +13,6 @@ describe('DeviceLinkMessage', () => {
     beforeEach(() => {
         linkRequestMessage = new DeviceLinkRequestMessage({
             timestamp: Date.now(),
-            identifier: '123456',
             primaryDevicePubKey: '111111',
             secondaryDevicePubKey: '222222',
             requestSignature: new Uint8Array([1, 2, 3, 4, 5, 6]),
@@ -27,7 +26,6 @@ describe('DeviceLinkMessage', () => {
 
         linkGrantMessage = new DeviceLinkGrantMessage({
             timestamp: Date.now(),
-            identifier: '123456',
             primaryDevicePubKey: '111111',
             secondaryDevicePubKey: '222222',
             requestSignature: new Uint8Array([1, 2, 3, 4, 5, 6]),

ts/test/session/messages/DeviceUnlinkMessage_test.ts

@@ -8,8 +8,7 @@ describe('DeviceUnlinkMessage', () => {
     let message: DeviceUnlinkMessage;
     beforeEach(() => {
         const timestamp = Date.now();
-        const identifier = '123456';
-        message = new DeviceUnlinkMessage({timestamp, identifier});
+        message = new DeviceUnlinkMessage({timestamp});
     });
 
     it('content of just the UNPAIRING_REQUEST flag set', () => {

ts/test/session/messages/EndSessionMessage_test.ts

@@ -8,9 +8,8 @@ describe('EndSessionMessage', () => {
     let message: EndSessionMessage;
     beforeEach(() => {
         const timestamp = Date.now();
-        const identifier = '123456';
         const preKeyBundle = {deviceId: 123456};
-        message = new EndSessionMessage({timestamp, identifier, preKeyBundle});
+        message = new EndSessionMessage({timestamp, preKeyBundle});
     });
 
     it('has a preKeyBundle', () => {

ts/test/session/messages/GroupInvitationMessage_test.ts

@@ -7,7 +7,6 @@ import { SignalService } from '../../../protobuf';
 describe('GroupInvitationMessage', () => {
     let message: GroupInvitationMessage;
     const timestamp = Date.now();
-    const identifier = '123456';
     const serverAddress = 'http://localhost';
     const channelId = 1;
     const serverName = 'test';
@@ -15,7 +14,6 @@ describe('GroupInvitationMessage', () => {
     beforeEach(() => {
         message = new GroupInvitationMessage({
             timestamp,
-            identifier,
             serverAddress,
             channelId,
             serverName,

ts/test/session/messages/ReceiptMessage_test.ts

@@ -12,9 +12,8 @@ describe('ReceiptMessage', () => {
     beforeEach(() => {
         timestamps = [987654321, 123456789];
         const timestamp = Date.now();
-        const identifier = '123456';
-        readMessage = new ReadReceiptMessage({timestamp, identifier, timestamps});
-        deliveryMessage = new DeliveryReceiptMessage({timestamp, identifier, timestamps});
+        readMessage = new ReadReceiptMessage({timestamp, timestamps});
+        deliveryMessage = new DeliveryReceiptMessage({timestamp, timestamps});
     });
 
     it('content of a read receipt is correct', () => {

ts/test/session/messages/SessionEstablishedMessage_test.ts

@@ -8,8 +8,7 @@ describe('SessionEstablishedMessage', () => {
     let message: SessionEstablishedMessage;
     beforeEach(() => {
         const timestamp = Date.now();
-        const identifier = '123456';
-        message = new SessionEstablishedMessage({timestamp, identifier});
+        message = new SessionEstablishedMessage({timestamp});
     });
 
     it('has a nullMessage not null', () => {

ts/test/session/messages/SessionResetMessage_test.ts

@@ -8,9 +8,8 @@ describe('SessionResetMessage', () => {
     let message: SessionResetMessage;
     beforeEach(() => {
         const timestamp = Date.now();
-        const identifier = '123456';
         const preKeyBundle = {deviceId: 123456};
-        message = new SessionResetMessage({timestamp, identifier, preKeyBundle});
+        message = new SessionResetMessage({timestamp, preKeyBundle});
     });
 
     it('has a preKeyBundle', () => {

ts/test/session/messages/TypingMessage_test.ts

@@ -8,7 +8,6 @@ describe('TypingMessage', () => {
     it('has Action.STARTED if isTyping = true', () => {
         const message = new TypingMessage({
             timestamp: Date.now(),
-            identifier: '123456',
             isTyping: true,
         });
         const plainText = message.plainTextBuffer();
@@ -19,7 +18,6 @@ describe('TypingMessage', () => {
     it('has Action.STOPPED if isTyping = false', () => {
         const message = new TypingMessage({
             timestamp: Date.now(),
-            identifier: '123456',
             isTyping: false,
         });
         const plainText = message.plainTextBuffer();
@@ -30,7 +28,6 @@ describe('TypingMessage', () => {
     it('has typingTimestamp set if value passed', () => {
         const message = new TypingMessage({
             timestamp: Date.now(),
-            identifier: '123456',
             isTyping: true,
             typingTimestamp: 111111111,
         });
@@ -43,7 +40,6 @@ describe('TypingMessage', () => {
     it('has typingTimestamp set with Date.now() if value not passed', () => {
         const message = new TypingMessage({
             timestamp: Date.now(),
-            identifier: '123456',
             isTyping: true,
         });
         const plainText = message.plainTextBuffer();
@@ -56,7 +52,6 @@ describe('TypingMessage', () => {
         const groupId = '6666666666';
         const message = new TypingMessage({
             timestamp: Date.now(),
-            identifier: '123456',
             isTyping: true,
             groupId,
         });
@@ -70,7 +65,6 @@ describe('TypingMessage', () => {
     it('ttl of 1 minute', () => {
         const message = new TypingMessage({
             timestamp: Date.now(),
-            identifier: '123456',
             isTyping: true,
         });
         expect(message.ttl()).to.equal(60 * 1000);