@wireapp/core 28.7.1 → 29.0.2

package/CHANGELOG.md

@@ -3,6 +3,38 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [29.0.2](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@29.0.1...@wireapp/core@29.0.2) (2022-07-25)
+
+**Note:** Version bump only for package @wireapp/core
+
+
+
+
+
+## [29.0.1](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@29.0.0...@wireapp/core@29.0.1) (2022-07-25)
+
+**Note:** Version bump only for package @wireapp/core
+
+
+
+
+
+# [29.0.0](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@28.7.1...@wireapp/core@29.0.0) (2022-07-22)
+
+
+### Features
+
+* **core:** prepare conversationService addUsers() for MLS and Proteus Versions, clean up code, fix scripts (FS-815) ([#4339](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/issues/4339)) ([8f1aeec](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/commit/8f1aeecf3391052ca741419577e1e11a393eab39))
+
+
+### BREAKING CHANGES
+
+* **core:** * The addUser() function in ConversationService.ts has been renamed to addUsers(), and its API changed in preparation for the MLS and Proteus split.
+
+
+
+
+
 ## [28.7.1](https://github.com/wireapp/wire-web-packages/tree/main/packages/core/compare/@wireapp/core@28.7.0...@wireapp/core@28.7.1) (2022-07-20)
 
 **Note:** Version bump only for package @wireapp/core

package/package.json

@@ -7,7 +7,7 @@
     "@otak/core-crypto": "0.3.0-beta-2",
     "@types/long": "4.0.1",
     "@types/node": "~14",
-    "@wireapp/api-client": "19.17.0",
+    "@wireapp/api-client": "19.17.2",
     "@wireapp/commons": "4.3.0",
     "@wireapp/cryptobox": "12.8.0",
     "@wireapp/store-engine-dexie": "1.6.10",
@@ -63,7 +63,7 @@
     "build": "yarn build:node && yarn build:browser",
     "build:browser": "webpack --progress",
     "build:node": "tsc",
-    "clean": "rimraf .tmp \"src/main/{!(*.test*).js,*.js.map,*.d.ts}\" \"src/main/test/{*.js.map,*.d.ts}\" \"src/main/!(test)/{!(*.test*).js,*.js.map,*.d.ts}\"",
+    "clean": "rimraf .tmp \"src/main/{!(*.test*).js,*.js.map,*.d.ts}\" \"src/main/test/{*.js.map,*.d.ts}\" \"src/main/!(test)/{!(*.test*).js,*.js.map,*.d.ts}\" \"src/main/**/{!(*.test*|AccountHelper|StoreHelper).js,*.js.map,*.d.ts}\" \"src/main/**/*.node.js\"",
     "coverage": "cross-env JASMINE_CONFIG_PATH=src/test/node/support/jasmine.json istanbul cover --report html ../../node_modules/jasmine/bin/jasmine.js",
     "demo:composite": "cross-env NODE_DEBUG=@wireapp* ts-node src/demo/composite.ts",
     "demo:sendCounter": "cross-env NODE_DEBUG=@wireapp* ts-node src/demo/sendCounter.ts",
@@ -71,12 +71,12 @@
     "start": "yarn dist && node index.js",
     "start:echo": "cross-env NODE_DEBUG=@wireapp/core* node src/demo/echo.js",
     "start:sender": "cross-env NODE_DEBUG=@wireapp/core* node src/demo/sender.js",
-    "test": "yarn test:node && yarn test:browser",
+    "test": "yarn clean && yarn build && yarn test:node && yarn test:browser",
     "test:browser": "webpack --mode=development && karma start",
     "test:project": "yarn dist && yarn test",
     "test:node": "nyc jasmine --config=jasmine.json",
     "watch": "tsc ---watch"
   },
-  "version": "28.7.1",
-  "gitHead": "9d748a27bed968825bb159221bfe4ecb43cd5c2d"
+  "version": "29.0.2",
+  "gitHead": "1ced13e856df4efbf53ae4be955db98ab7a25899"
 }

package/src/main/conversation/{AssetService.d.ts → AssetService/AssetService.d.ts}

@@ -2,7 +2,7 @@
 import type { APIClient } from '@wireapp/api-client';
 import type { AssetOptions } from '@wireapp/api-client/src/asset';
 import type { ProgressCallback, RequestCancelable } from '@wireapp/api-client/src/http';
-import type { EncryptedAssetUploaded } from '../cryptography/';
+import type { EncryptedAssetUploaded } from '../../cryptography';
 export interface AssetDataV4 {
     assetKey: string;
     assetToken: string;

package/src/main/conversation/{AssetService.js → AssetService/AssetService.js}

@@ -19,7 +19,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetService = void 0;
-const AssetCryptography_1 = require("../cryptography/AssetCryptography");
+const AssetCryptography_1 = require("../../cryptography/AssetCryptography");
 class AssetService {
     constructor(apiClient) {
         this.apiClient = apiClient;

package/src/main/conversation/AssetService/index.d.ts

@@ -0,0 +1 @@
+export * from './AssetService';

package/src/main/conversation/AssetService/index.js

@@ -0,0 +1,32 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./AssetService"), exports);
+//# sourceMappingURL=index.js.map

package/src/main/conversation/{ConversationMapper.d.ts → ConversationMapper/ConversationMapper.d.ts}

@@ -1,5 +1,5 @@
 import { ConversationEvent } from '@wireapp/api-client/src/event';
-import { PayloadBundle, PayloadBundleSource } from './message/PayloadBundle';
+import { PayloadBundle, PayloadBundleSource } from '../message/PayloadBundle';
 export declare class ConversationMapper {
     static mapConversationEvent(event: ConversationEvent, source: PayloadBundleSource): PayloadBundle;
     private static mapConversationEventType;

package/src/main/conversation/{ConversationMapper.js → ConversationMapper/ConversationMapper.js}

@@ -20,8 +20,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConversationMapper = void 0;
 const event_1 = require("@wireapp/api-client/src/event");
-const MessageBuilder_1 = require("./message/MessageBuilder");
-const PayloadBundle_1 = require("./message/PayloadBundle");
+const MessageBuilder_1 = require("../message/MessageBuilder");
+const PayloadBundle_1 = require("../message/PayloadBundle");
 class ConversationMapper {
     static mapConversationEvent(event, source) {
         return {

package/src/main/conversation/ConversationMapper/index.d.ts

@@ -0,0 +1 @@
+export * from './ConversationMapper';

package/src/main/conversation/ConversationMapper/index.js

@@ -0,0 +1,32 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./ConversationMapper"), exports);
+//# sourceMappingURL=index.js.map

package/src/main/conversation/{ConversationService.d.ts → ConversationService/ConversationService.d.ts}

@@ -1,95 +1,15 @@
 import type { CoreCrypto } from '@otak/core-crypto';
 import type { APIClient } from '@wireapp/api-client';
-import { MessageSendingStatus, Conversation, DefaultConversationRoleName, MutedStatus, NewConversation, QualifiedUserClients, UserClients, ClientMismatch, ConversationProtocol } from '@wireapp/api-client/src/conversation';
+import { MessageSendingStatus, Conversation, DefaultConversationRoleName, MutedStatus, NewConversation, QualifiedUserClients, UserClients, ClientMismatch } from '@wireapp/api-client/src/conversation';
 import type { ConversationMemberLeaveEvent } from '@wireapp/api-client/src/event';
 import type { QualifiedId, UserPreKeyBundleMap } from '@wireapp/api-client/src/user';
-import { GenericMessage } from '@wireapp/protocol-messaging';
-import { MessageTimer } from '../conversation/';
-import type { RemoteData } from '../conversation/content/';
-import type { CryptographyService } from '../cryptography/';
-import type { ClearConversationMessage, DeleteMessage, HideMessage, OtrMessage } from './message/OtrMessage';
+import { MessageTimer } from '../../conversation/';
+import type { RemoteData } from '../../conversation/content/';
+import type { CryptographyService } from '../../cryptography/';
+import type { ClearConversationMessage, DeleteMessage, HideMessage, OtrMessage } from '../message/OtrMessage';
 import { XOR } from '@wireapp/commons/src/main/util/TypeUtil';
-import type { NotificationService } from '../notification';
-export declare enum MessageTargetMode {
-    NONE = 0,
-    USERS = 1,
-    USERS_CLIENTS = 2
-}
-interface SendCommonParams<T> {
-    /**
-     * The protocol to use to send the message (MLS or Proteus)
-     */
-    protocol: ConversationProtocol;
-    /**
-     * The message to send to the conversation
-     */
-    payload: T;
-    onStart?: (message: GenericMessage) => void | boolean | Promise<boolean>;
-    onSuccess?: (message: GenericMessage, sentTime?: string) => void;
-}
-declare type SendProteusMessageParams<T> = SendCommonParams<T> & MessageSendingOptions & {
-    /**
-     * Can be either a QualifiedId[], string[], UserClients or QualfiedUserClients. The type has some effect on the behavior of the method. (Needed only for Proteus)
-     *    When given a QualifiedId[] or string[] the method will fetch the freshest list of devices for those users (since they are not given by the consumer). As a consequence no ClientMismatch error will trigger and we will ignore missing clients when sending
-     *    When given a QualifiedUserClients or UserClients the method will only send to the clients listed in the userIds. This could lead to ClientMismatch (since the given list of devices might not be the freshest one and new clients could have been created)
-     *    When given a QualifiedId[] or QualifiedUserClients the method will send the message through the federated API endpoint
-     *    When given a string[] or UserClients the method will send the message through the old API endpoint
-     */
-    userIds?: string[] | QualifiedId[] | UserClients | QualifiedUserClients;
-    onClientMismatch?: (status: ClientMismatch | MessageSendingStatus, wasSent: boolean) => void | boolean | Promise<boolean>;
-};
-declare type SendMlsMessageParams<T> = SendCommonParams<T> & {
-    /**
-     * The groupId of the conversation to send the message to (Needed only for MLS)
-     */
-    groupId: string;
-};
-interface MessageSendingOptions {
-    /**
-     * The federated domain the server runs on. Should only be set for federation enabled envs
-     */
-    conversationDomain?: string;
-    /**
-     * can be either a QualifiedId[] or QualfiedUserClients or undefined. The type has some effect on the behavior of the method.
-     *    When given undefined the method will fetch both the members of the conversations and their devices. No ClientMismatch can happen in that case
-     *    When given a QualifiedId[] the method will fetch the freshest list of devices for those users (since they are not given by the consumer). As a consequence no ClientMismatch error will trigger and we will ignore missing clients when sending
-     *    When given a QualifiedUserClients the method will only send to the clients listed in the userIds. This could lead to ClientMismatch (since the given list of devices might not be the freshest one and new clients could have been created)
-     */
-    userIds?: string[] | QualifiedId[] | UserClients | QualifiedUserClients;
-    /**
-     * Will send the message as a protobuf payload
-     */
-    sendAsProtobuf?: boolean;
-    nativePush?: boolean;
-    /**
-     * Will be called whenever there is a clientmismatch returned from the server. Needs to be combined with a userIds of type QualifiedUserClients
-     */
-    onClientMismatch?: MessageSendingCallbacks['onClientMismatch'];
-    /**
-     * Defines the behavior to use when a mismatch happens on backend side:
-     *     - NONE -> Not a targetted message, we want to send to all the users/clients in the conversation. Will report all missing users and clients (default mode)
-     *     - USERS -> A message targetted to all the clients of the given users (according to params.userIds). Will ignore missing users and only report missing clients for the given params.userIds
-     *     - USERS_CLIENTS -> A message targetted at some specific clients of specific users (according to params.userIds). Will force sending the message even if users or clients are missing
-     */
-    targetMode?: MessageTargetMode;
-}
-export interface MessageSendingCallbacks {
-    /**
-     * Will be called before a message is actually sent. Returning 'false' will prevent the message from being sent
-     * @param message The message being sent
-     * @return true or undefined if the message should be sent, false if the message sending should be cancelled
-     */
-    onStart?: (message: GenericMessage) => void | boolean | Promise<boolean>;
-    onSuccess?: (message: GenericMessage, sentTime?: string) => void;
-    /**
-     * Called whenever there is a clientmismatch returned from the server. Will also indicate the sending status of the message (if it was already sent or not)
-     *
-     * @param status The mismatch info
-     * @param wasSent Indicate whether the message was already sent or if it can still be canceled
-     * @return
-     */
-    onClientMismatch?: (status: ClientMismatch | MessageSendingStatus, wasSent: boolean) => void | boolean | Promise<boolean>;
-}
+import type { NotificationService } from '../../notification';
+import { AddUsersParams, MessageSendingCallbacks, MessageSendingOptions, SendMlsMessageParams, SendProteusMessageParams } from './ConversationService.types';
 export declare class ConversationService {
     private readonly apiClient;
     private readonly config;
@@ -207,7 +127,9 @@ export declare class ConversationService {
     getConversations(conversationIds?: string[]): Promise<Conversation[]>;
     getAsset({ assetId, assetToken, otrKey, sha256 }: RemoteData): Promise<Uint8Array>;
     getUnencryptedAsset(assetId: string, assetToken?: string): Promise<ArrayBuffer>;
-    addUser(conversationId: QualifiedId, userIds: string | string[] | QualifiedId | QualifiedId[]): Promise<QualifiedId[]>;
+    private addUsersToProteusGroup;
+    private addUsersToMLSGroup;
+    addUsers({ conversationId, protocol, userIds }: AddUsersParams): Promise<void | import("@wireapp/api-client/src/event").ConversationMemberJoinEvent>;
     removeUser(conversationId: string, userId: string): Promise<string>;
     private sendMlsMessage;
     private sendProteusMessage;
@@ -224,4 +146,3 @@ export declare class ConversationService {
     private isClearFromMismatch;
     private generateGenericMessage;
 }
-export {};

package/src/main/conversation/{ConversationService.js → ConversationService/ConversationService.js}

@@ -18,26 +18,18 @@
  *
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConversationService = exports.MessageTargetMode = void 0;
+exports.ConversationService = void 0;
 const bazinga64_1 = require("bazinga64");
 const conversation_1 = require("@wireapp/api-client/src/conversation");
 const data_1 = require("@wireapp/api-client/src/conversation/data");
 const protocol_messaging_1 = require("@wireapp/protocol-messaging");
-const conversation_2 = require("../conversation/");
-const AssetCryptography_1 = require("../cryptography/AssetCryptography");
-const TypePredicateUtil_1 = require("../util/TypePredicateUtil");
-const MessageBuilder_1 = require("./message/MessageBuilder");
-const MessageService_1 = require("./message/MessageService");
-const MessageToProtoMapper_1 = require("./message/MessageToProtoMapper");
-var MessageTargetMode;
-(function (MessageTargetMode) {
-    MessageTargetMode[MessageTargetMode["NONE"] = 0] = "NONE";
-    MessageTargetMode[MessageTargetMode["USERS"] = 1] = "USERS";
-    MessageTargetMode[MessageTargetMode["USERS_CLIENTS"] = 2] = "USERS_CLIENTS";
-})(MessageTargetMode = exports.MessageTargetMode || (exports.MessageTargetMode = {}));
-function isMLS(params) {
-    return params.protocol === conversation_1.ConversationProtocol.MLS;
-}
+const conversation_2 = require("../../conversation/");
+const AssetCryptography_1 = require("../../cryptography/AssetCryptography");
+const TypePredicateUtil_1 = require("../../util/TypePredicateUtil");
+const MessageBuilder_1 = require("../message/MessageBuilder");
+const MessageService_1 = require("../message/MessageService");
+const MessageToProtoMapper_1 = require("../message/MessageToProtoMapper");
+const ConversationService_types_1 = require("./ConversationService.types");
 class ConversationService {
     constructor(apiClient, cryptographyService, config, coreCryptoClientProvider, notificationService) {
         this.apiClient = apiClient;
@@ -171,9 +163,9 @@ class ConversationService {
      * @param genericMessage The payload of the message to send
      * @return Resolves with the message sending status from backend
      */
-    async sendGenericMessage(sendingClientId, conversationId, genericMessage, { conversationDomain, userIds, nativePush, sendAsProtobuf, onClientMismatch, targetMode = MessageTargetMode.NONE, } = {}) {
+    async sendGenericMessage(sendingClientId, conversationId, genericMessage, { conversationDomain, userIds, nativePush, sendAsProtobuf, onClientMismatch, targetMode = ConversationService_types_1.MessageTargetMode.NONE, } = {}) {
         const plainText = protocol_messaging_1.GenericMessage.encode(genericMessage).finish();
-        if (targetMode !== MessageTargetMode.NONE && !userIds) {
+        if (targetMode !== ConversationService_types_1.MessageTargetMode.NONE && !userIds) {
             throw new Error('Cannot send targetted message when no userIds are given');
         }
         if (conversationDomain && this.config.useQualifiedIds) {
@@ -182,10 +174,10 @@ class ConversationService {
             }
             const recipients = await this.getQualifiedRecipientsForConversation({ id: conversationId, domain: conversationDomain }, userIds);
             let reportMissing;
-            if (targetMode === MessageTargetMode.NONE) {
+            if (targetMode === ConversationService_types_1.MessageTargetMode.NONE) {
                 reportMissing = (0, TypePredicateUtil_1.isQualifiedUserClients)(userIds); // we want to check mismatch in case the consumer gave an exact list of users/devices
             }
-            else if (targetMode === MessageTargetMode.USERS) {
+            else if (targetMode === ConversationService_types_1.MessageTargetMode.USERS) {
                 reportMissing = this.extractQualifiedUserIds(userIds);
             }
             else {
@@ -204,10 +196,10 @@ class ConversationService {
         }
         const recipients = await this.getRecipientsForConversation(conversationId, userIds);
         let reportMissing;
-        if (targetMode === MessageTargetMode.NONE) {
+        if (targetMode === ConversationService_types_1.MessageTargetMode.NONE) {
             reportMissing = (0, TypePredicateUtil_1.isUserClients)(userIds); // we want to check mismatch in case the consumer gave an exact list of users/devices
         }
-        else if (targetMode === MessageTargetMode.USERS) {
+        else if (targetMode === ConversationService_types_1.MessageTargetMode.USERS) {
             reportMissing = this.extractUserIds(userIds);
         }
         else {
@@ -712,11 +704,17 @@ class ConversationService {
         const request = await this.apiClient.api.asset.getAssetV3(assetId, assetToken);
         return (await request.response).buffer;
     }
-    async addUser(conversationId, userIds) {
-        const ids = Array.isArray(userIds) ? userIds : [userIds];
-        const qualifiedIds = (0, TypePredicateUtil_1.isStringArray)(ids) ? ids.map(id => ({ id, domain: '' })) : ids;
-        await this.apiClient.api.conversation.postMembers(conversationId, qualifiedIds);
-        return qualifiedIds;
+    async addUsersToProteusGroup({ conversationId, userIds }) {
+        const response = await this.apiClient.api.conversation.postMembers(conversationId, userIds);
+        return response;
+    }
+    async addUsersToMLSGroup({ conversationId, userIds }) {
+        return console.info('addUsersToMLSGroup', conversationId, userIds);
+    }
+    async addUsers({ conversationId, protocol, userIds }) {
+        return protocol === conversation_1.ConversationProtocol.MLS
+            ? this.addUsersToMLSGroup({ conversationId, userIds })
+            : this.addUsersToProteusGroup({ conversationId, userIds });
     }
     async removeUser(conversationId, userId) {
         await this.apiClient.api.conversation.deleteMember(conversationId, userId);
@@ -762,6 +760,9 @@ class ConversationService {
      * @return resolves with the sent message
      */
     async send(params) {
+        function isMLS(params) {
+            return params.protocol === conversation_1.ConversationProtocol.MLS;
+        }
         const { payload, onStart } = params;
         const { genericMessage, content } = this.generateGenericMessage(payload);
         if ((await (onStart === null || onStart === void 0 ? void 0 : onStart(genericMessage))) === false) {

package/src/main/conversation/ConversationService/ConversationService.types.d.ts

@@ -0,0 +1,94 @@
+import { GenericMessage } from '@wireapp/protocol-messaging';
+import { QualifiedUserClients, ClientMismatch, ConversationProtocol, MessageSendingStatus, UserClients } from '@wireapp/api-client/src/conversation';
+import { QualifiedId } from '@wireapp/api-client/src/user';
+export declare enum MessageTargetMode {
+    NONE = 0,
+    USERS = 1,
+    USERS_CLIENTS = 2
+}
+export interface MessageSendingOptions {
+    /**
+     * The federated domain the server runs on. Should only be set for federation enabled envs
+     */
+    conversationDomain?: string;
+    /**
+     * can be either a QualifiedId[] or QualfiedUserClients or undefined. The type has some effect on the behavior of the method.
+     *    When given undefined the method will fetch both the members of the conversations and their devices. No ClientMismatch can happen in that case
+     *    When given a QualifiedId[] the method will fetch the freshest list of devices for those users (since they are not given by the consumer). As a consequence no ClientMismatch error will trigger and we will ignore missing clients when sending
+     *    When given a QualifiedUserClients the method will only send to the clients listed in the userIds. This could lead to ClientMismatch (since the given list of devices might not be the freshest one and new clients could have been created)
+     */
+    userIds?: string[] | QualifiedId[] | UserClients | QualifiedUserClients;
+    /**
+     * Will send the message as a protobuf payload
+     */
+    sendAsProtobuf?: boolean;
+    nativePush?: boolean;
+    /**
+     * Will be called whenever there is a clientmismatch returned from the server. Needs to be combined with a userIds of type QualifiedUserClients
+     */
+    onClientMismatch?: MessageSendingCallbacks['onClientMismatch'];
+    /**
+     * Defines the behavior to use when a mismatch happens on backend side:
+     *     - NONE -> Not a targetted message, we want to send to all the users/clients in the conversation. Will report all missing users and clients (default mode)
+     *     - USERS -> A message targetted to all the clients of the given users (according to params.userIds). Will ignore missing users and only report missing clients for the given params.userIds
+     *     - USERS_CLIENTS -> A message targetted at some specific clients of specific users (according to params.userIds). Will force sending the message even if users or clients are missing
+     */
+    targetMode?: MessageTargetMode;
+}
+export interface MessageSendingCallbacks {
+    /**
+     * Will be called before a message is actually sent. Returning 'false' will prevent the message from being sent
+     * @param message The message being sent
+     * @return true or undefined if the message should be sent, false if the message sending should be cancelled
+     */
+    onStart?: (message: GenericMessage) => void | boolean | Promise<boolean>;
+    onSuccess?: (message: GenericMessage, sentTime?: string) => void;
+    /**
+     * Called whenever there is a clientmismatch returned from the server. Will also indicate the sending status of the message (if it was already sent or not)
+     *
+     * @param status The mismatch info
+     * @param wasSent Indicate whether the message was already sent or if it can still be canceled
+     * @return
+     */
+    onClientMismatch?: (status: ClientMismatch | MessageSendingStatus, wasSent: boolean) => void | boolean | Promise<boolean>;
+}
+/**
+ *   ######################################################################
+ *   ################ MLS and Proteus implementation types ################
+ *   ######################################################################
+ */
+/**
+ * The protocol to use to send the message (MLS or Proteus)
+ */
+export declare type ProtocolParam = {
+    protocol: ConversationProtocol;
+};
+/**
+ * The message to send to the conversation
+ */
+export declare type SendCommonParams<T> = ProtocolParam & {
+    payload: T;
+    onStart?: (message: GenericMessage) => void | boolean | Promise<boolean>;
+    onSuccess?: (message: GenericMessage, sentTime?: string) => void;
+};
+export declare type SendProteusMessageParams<T> = SendCommonParams<T> & MessageSendingOptions & {
+    /**
+     * Can be either a QualifiedId[], string[], UserClients or QualfiedUserClients. The type has some effect on the behavior of the method. (Needed only for Proteus)
+     *    When given a QualifiedId[] or string[] the method will fetch the freshest list of devices for those users (since they are not given by the consumer). As a consequence no ClientMismatch error will trigger and we will ignore missing clients when sending
+     *    When given a QualifiedUserClients or UserClients the method will only send to the clients listed in the userIds. This could lead to ClientMismatch (since the given list of devices might not be the freshest one and new clients could have been created)
+     *    When given a QualifiedId[] or QualifiedUserClients the method will send the message through the federated API endpoint
+     *    When given a string[] or UserClients the method will send the message through the old API endpoint
+     */
+    userIds?: string[] | QualifiedId[] | UserClients | QualifiedUserClients;
+    onClientMismatch?: (status: ClientMismatch | MessageSendingStatus, wasSent: boolean) => void | boolean | Promise<boolean>;
+};
+export declare type SendMlsMessageParams<T> = SendCommonParams<T> & {
+    /**
+     * The groupId of the conversation to send the message to (Needed only for MLS)
+     */
+    groupId: string;
+};
+export declare type AddUsersParams = ProtocolParam & {
+    conversationId: QualifiedId;
+    userIds: QualifiedId[];
+};

package/src/main/conversation/ConversationService/ConversationService.types.js

@@ -0,0 +1,28 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MessageTargetMode = void 0;
+var MessageTargetMode;
+(function (MessageTargetMode) {
+    MessageTargetMode[MessageTargetMode["NONE"] = 0] = "NONE";
+    MessageTargetMode[MessageTargetMode["USERS"] = 1] = "USERS";
+    MessageTargetMode[MessageTargetMode["USERS_CLIENTS"] = 2] = "USERS_CLIENTS";
+})(MessageTargetMode = exports.MessageTargetMode || (exports.MessageTargetMode = {}));
+//# sourceMappingURL=ConversationService.types.js.map

package/src/main/conversation/ConversationService/index.d.ts

@@ -0,0 +1,2 @@
+export * from './ConversationService.types';
+export * from './ConversationService';

package/src/main/conversation/ConversationService/index.js

@@ -0,0 +1,33 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./ConversationService.types"), exports);
+__exportStar(require("./ConversationService"), exports);
+//# sourceMappingURL=index.js.map

package/src/main/conversation/MessageTimer/index.d.ts

@@ -0,0 +1 @@
+export * from './MessageTimer';

package/src/main/conversation/MessageTimer/index.js

@@ -0,0 +1,32 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2022 Wire Swiss GmbH
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
+ *
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./MessageTimer"), exports);
+//# sourceMappingURL=index.js.map