@wireapp/core 17.27.4 → 17.29.0

package/src/main/conversation/message/MessageService.ts

@@ -41,6 +41,7 @@ import {MessageBuilder} from './MessageBuilder';
 import {GenericMessage} from '@wireapp/protocol-messaging';
 import {GenericMessageType} from '..';
 import {flattenUserClients, flattenQualifiedUserClients} from './UserClientsUtil';
+import {isQualifiedIdArray, isStringArray} from '../../util';
 
 type ClientMismatchError = AxiosError<ClientMismatch | MessageSendingStatus>;
 
@@ -65,8 +66,9 @@ export class MessageService {
     plainText: Uint8Array,
     options: {
       conversationId?: string;
-      reportMissing?: boolean;
+      reportMissing?: boolean | string[];
       sendAsProtobuf?: boolean;
+      nativePush?: boolean;
       onClientMismatch?: (mismatch: ClientMismatch) => void | boolean | Promise<boolean>;
     } = {},
   ): Promise<ClientMismatch & {errored?: boolean}> {
@@ -119,7 +121,8 @@ export class MessageService {
     options: {
       assetData?: Uint8Array;
       conversationId?: QualifiedId;
-      reportMissing?: boolean;
+      reportMissing?: boolean | QualifiedId[];
+      nativePush?: boolean;
       onClientMismatch?: (mismatch: MessageSendingStatus) => void | boolean | Promise<boolean>;
     },
   ): Promise<MessageSendingStatus & {errored?: boolean}> {
@@ -146,7 +149,12 @@ export class MessageService {
   private async sendFederatedOtrMessage(
     sendingClientId: string,
     recipients: QualifiedOTRRecipients,
-    options: {assetData?: Uint8Array; conversationId?: QualifiedId; reportMissing?: boolean},
+    options: {
+      assetData?: Uint8Array;
+      conversationId?: QualifiedId;
+      reportMissing?: boolean | QualifiedId[];
+      nativePush?: boolean;
+    },
   ): Promise<MessageSendingStatus> {
     const qualifiedUserEntries = Object.entries(recipients).map<ProtobufOTR.IQualifiedUserEntry>(
       ([domain, otrRecipients]) => {
@@ -177,6 +185,7 @@ export class MessageService {
       sender: {
         client: Long.fromString(sendingClientId, 16),
       },
+      nativePush: options.nativePush,
     });
 
     if (options.assetData) {
@@ -184,9 +193,13 @@ export class MessageService {
     }
 
     if (options.reportMissing) {
-      protoMessage.reportAll = {};
+      if (isQualifiedIdArray(options.reportMissing)) {
+        protoMessage.reportOnly = {userIds: options.reportMissing};
+      } else {
+        protoMessage.reportAll = true;
+      }
     } else {
-      protoMessage.ignoreAll = {};
+      protoMessage.ignoreAll = true;
     }
 
     if (!options.conversationId) {
@@ -202,22 +215,31 @@ export class MessageService {
   private async sendOTRMessage(
     sendingClientId: string,
     recipients: OTRRecipients<Uint8Array>,
-    options: {conversationId?: string; assetData?: Uint8Array; reportMissing?: boolean},
+    options: {
+      conversationId?: string;
+      assetData?: Uint8Array;
+      reportMissing?: boolean | string[];
+      nativePush?: boolean;
+    },
   ): Promise<ClientMismatch> {
     const message: NewOTRMessage<string> = {
       data: options.assetData ? Encoder.toBase64(options.assetData).asString : undefined,
       recipients: CryptographyService.convertArrayRecipientsToBase64(recipients),
       sender: sendingClientId,
+      native_push: options.nativePush,
     };
 
+    let ignoreMissing;
+    if (isStringArray(options.reportMissing)) {
+      message.report_missing = options.reportMissing;
+    } else {
+      // By default we want ignore missing to be false (and have mismatch errors in case some clients are missing)
+      ignoreMissing = typeof options.reportMissing === 'boolean' ? !options.reportMissing : false;
+    }
+
     return !options.conversationId
-      ? this.apiClient.broadcast.api.postBroadcastMessage(sendingClientId, message, !options.reportMissing)
-      : this.apiClient.conversation.api.postOTRMessage(
-          sendingClientId,
-          options.conversationId,
-          message,
-          !options.reportMissing,
-        );
+      ? this.apiClient.broadcast.api.postBroadcastMessage(sendingClientId, message, ignoreMissing)
+      : this.apiClient.conversation.api.postOTRMessage(sendingClientId, options.conversationId, message, ignoreMissing);
   }
 
   private async generateExternalPayload(plainText: Uint8Array): Promise<{text: Uint8Array; cipherText: Uint8Array}> {
@@ -309,7 +331,7 @@ export class MessageService {
   private async sendOTRProtobufMessage(
     sendingClientId: string,
     recipients: OTRRecipients<Uint8Array>,
-    options: {conversationId?: string; assetData?: Uint8Array; reportMissing?: boolean},
+    options: {conversationId?: string; assetData?: Uint8Array; reportMissing?: boolean | string[]},
   ): Promise<ClientMismatch> {
     const userEntries: ProtobufOTR.IUserEntry[] = Object.entries(recipients).map(([userId, otrClientMap]) => {
       const clients: ProtobufOTR.IClientEntry[] = Object.entries(otrClientMap).map(([clientId, payload]) => {
@@ -336,17 +358,26 @@ export class MessageService {
       },
     });
 
+    let ignoreMissing;
+    if (isStringArray(options.reportMissing)) {
+      const encoder = new TextEncoder();
+      protoMessage.reportMissing = options.reportMissing.map(userId => ({uuid: encoder.encode(userId)}));
+    } else {
+      // By default we want ignore missing to be false (and have mismatch errors in case some clients are missing)
+      ignoreMissing = typeof options.reportMissing === 'boolean' ? !options.reportMissing : false;
+    }
+
     if (options.assetData) {
       protoMessage.blob = options.assetData;
     }
 
     return !options.conversationId
-      ? this.apiClient.broadcast.api.postBroadcastProtobufMessage(sendingClientId, protoMessage, !options.reportMissing)
+      ? this.apiClient.broadcast.api.postBroadcastProtobufMessage(sendingClientId, protoMessage, ignoreMissing)
       : this.apiClient.conversation.api.postOTRProtobufMessage(
           sendingClientId,
           options.conversationId,
           protoMessage,
-          !options.reportMissing,
+          ignoreMissing,
         );
   }
 }

package/src/main/conversation/message/PayloadBundle.d.ts

@@ -10,7 +10,8 @@ export declare enum PayloadBundleSource {
 export declare enum PayloadBundleState {
     INCOMING = "PayloadBundleState.INCOMING",
     OUTGOING_SENT = "PayloadBundleState.OUTGOING_SENT",
-    OUTGOING_UNSENT = "PayloadBundleState.OUTGOING_UNSENT"
+    OUTGOING_UNSENT = "PayloadBundleState.OUTGOING_UNSENT",
+    CANCELLED = "PayloadBundleState.CANCELLED"
 }
 export interface BasePayloadBundle {
     content: PayloadBundleContent;

package/src/main/conversation/message/PayloadBundle.js

@@ -30,6 +30,7 @@ var PayloadBundleState;
     PayloadBundleState["INCOMING"] = "PayloadBundleState.INCOMING";
     PayloadBundleState["OUTGOING_SENT"] = "PayloadBundleState.OUTGOING_SENT";
     PayloadBundleState["OUTGOING_UNSENT"] = "PayloadBundleState.OUTGOING_UNSENT";
+    PayloadBundleState["CANCELLED"] = "PayloadBundleState.CANCELLED";
 })(PayloadBundleState = exports.PayloadBundleState || (exports.PayloadBundleState = {}));
 var PayloadBundleType;
 (function (PayloadBundleType) {

package/src/main/conversation/message/PayloadBundle.js.map

@@ -1 +1 @@
-{"version":3,"file":"PayloadBundle.js","sourceRoot":"","sources":["PayloadBundle.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;AASH,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC7B,0DAAmC,CAAA;IACnC,sFAA+D,CAAA;IAC/D,kEAA2C,CAAA;AAC7C,CAAC,EAJW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAI9B;AAED,IAAY,kBAIX;AAJD,WAAY,kBAAkB;IAC5B,8DAAwC,CAAA;IACxC,wEAAkD,CAAA;IAClD,4EAAsD,CAAA;AACxD,CAAC,EAJW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAI7B;AAiBD,IAAY,iBA2CX;AA3CD,WAAY,iBAAiB;IAC3B,sDAAiC,CAAA;IACjC,kEAA6C,CAAA;IAC7C,kEAA6C,CAAA;IAC7C,gEAA2C,CAAA;IAC3C,sEAAiD,CAAA;IACjD,gGAA2E,CAAA;IAC3E,oDAA+B,CAAA;IAC/B,sEAAiD,CAAA;IACjD,gEAA2C,CAAA;IAC3C,sEAAiD,CAAA;IACjD,8DAAyC,CAAA;IACzC,oEAA+C,CAAA;IAC/C,gFAA2D,CAAA;IAC3D,gFAA2D,CAAA;IAC3D,kFAA6D,CAAA;IAC7D,4DAAuC,CAAA;IACvC,kEAA6C,CAAA;IAC7C,wEAAmD,CAAA;IACnD,oEAA+C,CAAA;IAC/C,oEAA+C,CAAA;IAC/C,oDAA+B,CAAA;IAC/B,4DAAuC,CAAA;IACvC,4FAAuE,CAAA;IACvE,4FAAuE,CAAA;IACvE,kEAA6C,CAAA;IAC7C,4EAAuD,CAAA;IACvD,8EAAyD,CAAA;IACzD,kEAA6C,CAAA;IAC7C,oDAA+B,CAAA;IAC/B,oEAA+C,CAAA;IAC/C,wDAAmC,CAAA;IACnC,0DAAqC,CAAA;IACrC,sEAAiD,CAAA;IACjD,0EAAqD,CAAA;IACrD,gFAA2D,CAAA;IAC3D,0EAAqD,CAAA;IACrD,kEAA6C,CAAA;IAC7C,0FAAqE,CAAA;IACrE,wFAAmE,CAAA;IACnE,0FAAqE,CAAA;IACrE,kFAA6D,CAAA;IAC7D,kEAA6C,CAAA;AAC/C,CAAC,EA3CW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QA2C5B"}
+{"version":3,"file":"PayloadBundle.js","sourceRoot":"","sources":["PayloadBundle.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;;AASH,IAAY,mBAIX;AAJD,WAAY,mBAAmB;IAC7B,0DAAmC,CAAA;IACnC,sFAA+D,CAAA;IAC/D,kEAA2C,CAAA;AAC7C,CAAC,EAJW,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAI9B;AAED,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,8DAAwC,CAAA;IACxC,wEAAkD,CAAA;IAClD,4EAAsD,CAAA;IACtD,gEAA0C,CAAA;AAC5C,CAAC,EALW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAK7B;AAiBD,IAAY,iBA2CX;AA3CD,WAAY,iBAAiB;IAC3B,sDAAiC,CAAA;IACjC,kEAA6C,CAAA;IAC7C,kEAA6C,CAAA;IAC7C,gEAA2C,CAAA;IAC3C,sEAAiD,CAAA;IACjD,gGAA2E,CAAA;IAC3E,oDAA+B,CAAA;IAC/B,sEAAiD,CAAA;IACjD,gEAA2C,CAAA;IAC3C,sEAAiD,CAAA;IACjD,8DAAyC,CAAA;IACzC,oEAA+C,CAAA;IAC/C,gFAA2D,CAAA;IAC3D,gFAA2D,CAAA;IAC3D,kFAA6D,CAAA;IAC7D,4DAAuC,CAAA;IACvC,kEAA6C,CAAA;IAC7C,wEAAmD,CAAA;IACnD,oEAA+C,CAAA;IAC/C,oEAA+C,CAAA;IAC/C,oDAA+B,CAAA;IAC/B,4DAAuC,CAAA;IACvC,4FAAuE,CAAA;IACvE,4FAAuE,CAAA;IACvE,kEAA6C,CAAA;IAC7C,4EAAuD,CAAA;IACvD,8EAAyD,CAAA;IACzD,kEAA6C,CAAA;IAC7C,oDAA+B,CAAA;IAC/B,oEAA+C,CAAA;IAC/C,wDAAmC,CAAA;IACnC,0DAAqC,CAAA;IACrC,sEAAiD,CAAA;IACjD,0EAAqD,CAAA;IACrD,gFAA2D,CAAA;IAC3D,0EAAqD,CAAA;IACrD,kEAA6C,CAAA;IAC7C,0FAAqE,CAAA;IACrE,wFAAmE,CAAA;IACnE,0FAAqE,CAAA;IACrE,kFAA6D,CAAA;IAC7D,kEAA6C,CAAA;AAC/C,CAAC,EA3CW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QA2C5B"}

package/src/main/conversation/message/PayloadBundle.ts

@@ -34,6 +34,7 @@ export enum PayloadBundleState {
   INCOMING = 'PayloadBundleState.INCOMING',
   OUTGOING_SENT = 'PayloadBundleState.OUTGOING_SENT',
   OUTGOING_UNSENT = 'PayloadBundleState.OUTGOING_UNSENT',
+  CANCELLED = 'PayloadBundleState.CANCELLED',
 }
 
 export interface BasePayloadBundle {