@wireapp/core 42.19.0 → 42.19.1

package/lib/Account.d.ts

@@ -9,6 +9,7 @@ import { BroadcastService } from './broadcast/';
 import { ClientInfo, ClientService } from './client/';
 import { ConnectionService } from './connection/';
 import { AssetService, ConversationService } from './conversation/';
+import { SubconversationService } from './conversation/SubconversationService/SubconversationService';
 import { GiphyService } from './giphy/';
 import { LinkPreviewService } from './linkPreview';
 import { MLSService } from './messagingProtocols/mls';
@@ -83,6 +84,7 @@ export declare class Account extends TypedEventEmitter<Events> {
         client: ClientService;
         connection: ConnectionService;
         conversation: ConversationService;
+        subconversation: SubconversationService;
         giphy: GiphyService;
         linkPreview: LinkPreviewService;
         notification: NotificationService;

package/lib/Account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../src/Account.ts"],"names":[],"mappings":"AAmBA,OAAO,EACL,YAAY,EAGZ,OAAO,EACP,MAAM,EAEN,SAAS,EACV,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAuB,UAAU,EAAE,gBAAgB,EAAC,MAAM,iCAAiC,CAAC;AACnG,OAAO,KAAK,MAAM,MAAM,+BAA+B,CAAC;AAOxD,OAAO,EAAC,SAAS,EAAE,eAAe,EAAC,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,EAAC,UAAU,EAAe,MAAM,uBAAuB,CAAC;AAE/D,OAAO,EAAC,cAAc,EAAC,MAAM,YAAY,CAAC;AAE1C,OAAO,EAAC,gBAAgB,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAE,aAAa,EAAC,MAAM,WAAW,CAAC;AACpD,OAAO,EAAC,iBAAiB,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,EAAC,YAAY,EAAE,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAElE,OAAO,EAAC,YAAY,EAAC,MAAM,UAAU,CAAC;AACtC,OAAO,EAAC,kBAAkB,EAAC,MAAM,eAAe,CAAC;AACjD,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAC,aAAa,EAAE,mBAAmB,EAAO,MAAM,6CAA6C,CAAC;AACrG,OAAO,EAAC,YAAY,EAAE,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AAClF,OAAO,EAAC,SAAS,EAAE,cAAc,EAAC,MAAM,8BAA8B,CAAC;AAGvE,OAAO,EAAC,mBAAmB,EAAE,mBAAmB,EAAE,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AAEpC,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,EAAC,WAAW,EAAC,MAAM,SAAS,CAAC;AACpC,OAAO,EAAC,sBAAsB,EAAC,MAAM,+BAA+B,CAAC;AAErE,MAAM,MAAM,qBAAqB,GAAG,mBAAmB,CAAC;AAExD,oBAAY,MAAM;IAChB;;;OAGG;IACH,WAAW,gBAAgB;CAC5B;AAED,oBAAY,eAAe;IACzB,8EAA8E;IAC9E,MAAM,WAAW;IACjB,oCAAoC;IACpC,UAAU,eAAe;IACzB,mFAAmF;IACnF,wBAAwB,6BAA6B;IACrD,oGAAoG;IACpG,IAAI,SAAS;CACd;AAED,MAAM,MAAM,aAAa,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,SAAS,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;AAEjH,UAAU,cAAc;IACtB,8FAA8F;IAC9F,WAAW,CAAC,EAAE,aAAa,CAAC;IAE5B;;;;;;;;OAQG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;CAC7C;AAED,KAAK,WAAW,GAAG;IACjB,2FAA2F;IAC3F,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAQF,KAAK,MAAM,GAAG;IACZ,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,SAAS,CAAC;CACjC,CAAC;AAEF,qBAAa,OAAQ,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IACpD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IACxC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAgB;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAuB;IAC7D,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAyB;IACtD,OAAO,CAAC,WAAW,CAAC,CAAa;IACjC,OAAO,CAAC,EAAE,CAAC,CAAe;IAEnB,OAAO,CAAC,EAAE;QACf,GAAG,CAAC,EAAE,UAAU,CAAC;QACjB,WAAW,CAAC,EAAE,mBAAmB,CAAC;QAClC,OAAO,EAAE,cAAc,CAAC;QACxB,OAAO,EAAE,cAAc,CAAC;QACxB,KAAK,EAAE,YAAY,CAAC;QACpB,SAAS,EAAE,gBAAgB,CAAC;QAC5B,MAAM,EAAE,aAAa,CAAC;QACtB,UAAU,EAAE,iBAAiB,CAAC;QAC9B,YAAY,EAAE,mBAAmB,CAAC;QAClC,KAAK,EAAE,YAAY,CAAC;QACpB,WAAW,EAAE,kBAAkB,CAAC;QAChC,YAAY,EAAE,mBAAmB,CAAC;QAClC,IAAI,EAAE,WAAW,CAAC;QAClB,IAAI,EAAE,WAAW,CAAC;QAClB,IAAI,EAAE,WAAW,CAAC;KACnB,CAAC;IACK,eAAe,EAAE,eAAe,CAAC;IACjC,sBAAsB,EAAE,sBAAsB,CAAC;IAEtD;;;OAGG;gBAED,SAAS,GAAE,SAA2B,EACtC,EAAC,WAA6B,EAAE,SAAe,EAAE,oBAAoB,EAAC,GAAE,cAAmB;IAsC7F;;;;;;;;;;;OAWG;IACU,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO;IAMvE,OAAO,CAAC,aAAa;IAKR,UAAU,CACrB,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC;IA0BnC,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED;;;;;OAKG;IACU,QAAQ,CAAC,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAM3F;;;;OAIG;IACU,IAAI,CAAC,UAAU,EAAE,UAAU,EAAE,EAAC,MAAM,EAAC,GAAE,WAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IAMvF;;;;;OAKG;IACU,KAAK,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAU1D;;OAEG;IACU,cAAc,CACzB,SAAS,EAAE,SAAS,EACpB,UAAU,GAAE,UAA8B,EAC1C,WAAW,CAAC,EAAE,UAAU,GACvB,OAAO,CAAC,gBAAgB,CAAC;IAsB5B;;;;OAIG;IACU,UAAU,CAAC,MAAM,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAC/D,UAAU,IAAI,OAAO,CAAC,gBAAgB,GAAG,SAAS,CAAC;YAkClD,iBAAiB;IA2B/B;;;;;;OAMG;IACH,qBAAqB,CAAC,YAAY,EAAE,YAAY;IAInC,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IA6D1D,OAAO,CAAC,YAAY;IAKpB;;;OAGG;IACU,MAAM,CAAC,SAAS,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAS9D;;OAEG;YACW,IAAI;IAOlB;;;;;;OAMG;IACI,MAAM,CAAC,EACZ,OAAkB,EAClB,wBAAmC,EACnC,4BAAuC,EACvC,qBAAgC,EAChC,MAAc,GACf,GAAE;QACD;;;;WAIG;QACH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,mBAAmB,EAAE,MAAM,EAAE,kBAAkB,KAAK,IAAI,CAAC;QAE7E;;WAEG;QACH,4BAA4B,CAAC,EAAE,CAAC,EAAC,IAAI,EAAE,KAAK,EAAC,EAAE;YAAC,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAC,KAAK,IAAI,CAAC;QAEtF;;WAEG;QACH,wBAAwB,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,IAAI,CAAC;QAE5D;;;;;;WAMG;QACH,qBAAqB,CAAC,EAAE,CAAC,cAAc,EAAE,MAAM,KAAK,IAAI,CAAC;QAEzD;;WAEG;QACH,MAAM,CAAC,EAAE,OAAO,CAAC;KACb,GAAG,MAAM,IAAI;IA2FnB,OAAO,CAAC,cAAc;IAKtB,OAAO,CAAC,kBAAkB;YAIZ,UAAU;CAqBzB"}
+{"version":3,"file":"Account.d.ts","sourceRoot":"","sources":["../src/Account.ts"],"names":[],"mappings":"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"}

package/lib/Account.js

@@ -45,6 +45,7 @@ const client_2 = require("./client/");
 const connection_1 = require("./connection/");
 const conversation_1 = require("./conversation/");
 const messageSender_1 = require("./conversation/message/messageSender");
+const SubconversationService_1 = require("./conversation/SubconversationService/SubconversationService");
 const giphy_1 = require("./giphy/");
 const linkPreview_1 = require("./linkPreview");
 const mls_1 = require("./messagingProtocols/mls");
@@ -245,7 +246,7 @@ class Account extends commons_1.TypedEventEmitter {
             // initialize scheduler for syncing key packages with backend
             await this.service.mls.schedulePeriodicKeyPackagesBackendSync(validClient.id);
             // leave stale conference subconversations (e.g after a crash)
-            await this.service.mls.leaveStaleConferenceSubconversations();
+            await this.service.subconversation.leaveStaleConferenceSubconversations();
         }
         return validClient;
     }
@@ -306,6 +307,7 @@ class Account extends commons_1.TypedEventEmitter {
         const giphyService = new giphy_1.GiphyService(this.apiClient);
         const linkPreviewService = new linkPreview_1.LinkPreviewService(assetService);
         const conversationService = new conversation_1.ConversationService(this.apiClient, proteusService, this.db, mlsService);
+        const subconversationService = new SubconversationService_1.SubconversationService(this.apiClient, mlsService);
         const notificationService = new notification_1.NotificationService(this.apiClient, this.storeEngine, conversationService);
         const selfService = new self_1.SelfService(this.apiClient);
         const teamService = new team_1.TeamService(this.apiClient);
@@ -321,6 +323,7 @@ class Account extends commons_1.TypedEventEmitter {
             client: clientService,
             connection: connectionService,
             conversation: conversationService,
+            subconversation: subconversationService,
             giphy: giphyService,
             linkPreview: linkPreviewService,
             notification: notificationService,

package/lib/conversation/SubconversationService/SubconversationService.d.ts

@@ -0,0 +1,60 @@
+import { QualifiedId } from '@wireapp/api-client/lib/user';
+import { APIClient } from '@wireapp/api-client';
+import { TypedEventEmitter } from '@wireapp/commons';
+import { MLSService } from '../../messagingProtocols/mls';
+type Events = {
+    MLSConversationRecovered: {
+        conversationId: QualifiedId;
+    };
+};
+export interface SubconversationEpochInfoMember {
+    userid: `${string}@${string}`;
+    clientid: string;
+    in_subconv: boolean;
+}
+export declare class SubconversationService extends TypedEventEmitter<Events> {
+    private readonly apiClient;
+    private readonly _mlsService?;
+    private readonly logger;
+    constructor(apiClient: APIClient, _mlsService?: MLSService | undefined);
+    get mlsService(): MLSService;
+    /**
+     * Will join or register an mls subconversation for conference calls.
+     * Will return the secret key derived from the subconversation
+     *
+     * @param conversationId Id of the parent conversation in which the call should happen
+     */
+    joinConferenceSubconversation(conversationId: QualifiedId, shouldRetry?: boolean): Promise<{
+        groupId: string;
+        epoch: number;
+    }>;
+    /**
+     * Will leave conference subconversation if it's known by client and established.
+     *
+     * @param conversationId Id of the parent conversation which subconversation we want to leave
+     */
+    leaveConferenceSubconversation(conversationId: QualifiedId): Promise<void>;
+    leaveStaleConferenceSubconversations(): Promise<void>;
+    getSubconversationEpochInfo(conversationId: QualifiedId, shouldAdvanceEpoch?: boolean): Promise<{
+        members: SubconversationEpochInfoMember[];
+        epoch: number;
+        secretKey: string;
+        keyLength: number;
+    } | null>;
+    subscribeToEpochUpdates(conversationId: QualifiedId, findConversationByGroupId: (groupId: string) => QualifiedId | undefined, onEpochUpdate: (info: {
+        members: SubconversationEpochInfoMember[];
+        epoch: number;
+        secretKey: string;
+        keyLength: number;
+    }) => void): Promise<() => void>;
+    removeClientFromConferenceSubconversation(conversationId: QualifiedId, clientToRemove: {
+        user: QualifiedId;
+        clientId: string;
+    }): Promise<void>;
+    private joinSubconversationByExternalCommit;
+    private getConferenceSubconversation;
+    private deleteConferenceSubconversation;
+    private generateSubconversationMembers;
+}
+export {};
+//# sourceMappingURL=SubconversationService.d.ts.map

package/lib/conversation/SubconversationService/SubconversationService.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SubconversationService.d.ts","sourceRoot":"","sources":["../../../src/conversation/SubconversationService/SubconversationService.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAC,WAAW,EAAC,MAAM,8BAA8B,CAAC;AAIzD,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AAEnD,OAAO,EAAC,UAAU,EAAC,MAAM,8BAA8B,CAAC;AAIxD,KAAK,MAAM,GAAG;IACZ,wBAAwB,EAAE;QAAC,cAAc,EAAE,WAAW,CAAA;KAAC,CAAC;CACzD,CAAC;AAEF,MAAM,WAAW,8BAA8B;IAC7C,MAAM,EAAE,GAAG,MAAM,IAAI,MAAM,EAAE,CAAC;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,OAAO,CAAC;CACrB;AAID,qBAAa,sBAAuB,SAAQ,iBAAiB,CAAC,MAAM,CAAC;IAIjE,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAJ/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmD;gBAGvD,SAAS,EAAE,SAAS,EACpB,WAAW,CAAC,wBAAY;IAK3C,IAAI,UAAU,IAAI,UAAU,CAK3B;IAED;;;;;OAKG;IACU,6BAA6B,CACxC,cAAc,EAAE,WAAW,EAC3B,WAAW,UAAO,GACjB,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,CAAC;IAiD5C;;;;OAIG;IACU,8BAA8B,CAAC,cAAc,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IA4B1E,oCAAoC,IAAI,OAAO,CAAC,IAAI,CAAC;IAUrD,2BAA2B,CACtC,cAAc,EAAE,WAAW,EAC3B,kBAAkB,UAAQ,GACzB,OAAO,CAAC;QACT,OAAO,EAAE,8BAA8B,EAAE,CAAC;QAC1C,KAAK,EAAE,MAAM,CAAC;QACd,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,GAAG,IAAI,CAAC;IAsCI,uBAAuB,CAClC,cAAc,EAAE,WAAW,EAC3B,yBAAyB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,WAAW,GAAG,SAAS,EACvE,aAAa,EAAE,CAAC,IAAI,EAAE;QACpB,OAAO,EAAE,8BAA8B,EAAE,CAAC;QAC1C,KAAK,EAAE,MAAM,CAAC;QACd,SAAS,EAAE,MAAM,CAAC;QAClB,SAAS,EAAE,MAAM,CAAC;KACnB,KAAK,IAAI,GACT,OAAO,CAAC,MAAM,IAAI,CAAC;IAuCT,yCAAyC,CACpD,cAAc,EAAE,WAAW,EAC3B,cAAc,EAAE;QAAC,IAAI,EAAE,WAAW,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,GACpD,OAAO,CAAC,IAAI,CAAC;YAmCF,mCAAmC;YAMnC,4BAA4B;YAI5B,+BAA+B;YAO/B,8BAA8B;CAqB7C"}

package/lib/conversation/SubconversationService/SubconversationService.js

@@ -0,0 +1,207 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2023 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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SubconversationService = void 0;
+const conversation_1 = require("@wireapp/api-client/lib/conversation");
+const TimeUtil_1 = require("@wireapp/commons/lib/util/TimeUtil");
+const logdown_1 = __importDefault(require("logdown"));
+const commons_1 = require("@wireapp/commons");
+const subconversationGroupIdStore_1 = require("../../messagingProtocols/mls/MLSService/stores/subconversationGroupIdStore/subconversationGroupIdStore");
+const fullyQualifiedClientIdUtils_1 = require("../../util/fullyQualifiedClientIdUtils");
+const MLS_CONVERSATION_KEY_LENGTH = 32;
+class SubconversationService extends commons_1.TypedEventEmitter {
+    constructor(apiClient, _mlsService) {
+        super();
+        this.apiClient = apiClient;
+        this._mlsService = _mlsService;
+        this.logger = (0, logdown_1.default)('@wireapp/core/SubconversationService');
+    }
+    get mlsService() {
+        if (!this._mlsService) {
+            throw new Error('MLSService was not initialised!');
+        }
+        return this._mlsService;
+    }
+    /**
+     * Will join or register an mls subconversation for conference calls.
+     * Will return the secret key derived from the subconversation
+     *
+     * @param conversationId Id of the parent conversation in which the call should happen
+     */
+    async joinConferenceSubconversation(conversationId, shouldRetry = true) {
+        try {
+            const { group_id: subconversationGroupId, epoch: subconversationEpoch, epoch_timestamp: subconversationEpochTimestamp, subconv_id: subconversationId, } = await this.getConferenceSubconversation(conversationId);
+            if (subconversationEpoch === 0) {
+                const doesConversationExistsLocally = await this.mlsService.conversationExists(subconversationGroupId);
+                if (doesConversationExistsLocally) {
+                    await this.mlsService.wipeConversation(subconversationGroupId);
+                }
+                // If subconversation is not yet established, create it and upload the commit bundle.
+                await this.mlsService.registerConversation(subconversationGroupId, []);
+            }
+            else {
+                const epochUpdateTime = new Date(subconversationEpochTimestamp).getTime();
+                const epochAge = new Date().getTime() - epochUpdateTime;
+                if (epochAge > TimeUtil_1.TimeInMillis.DAY) {
+                    // If subconversation does exist, but it's older than 24h, delete and re-join
+                    await this.deleteConferenceSubconversation(conversationId, {
+                        groupId: subconversationGroupId,
+                        epoch: subconversationEpoch,
+                    });
+                    await this.mlsService.wipeConversation(subconversationGroupId);
+                    return this.joinConferenceSubconversation(conversationId);
+                }
+                await this.joinSubconversationByExternalCommit(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+            }
+            const epoch = Number(await this.mlsService.getEpoch(subconversationGroupId));
+            // We store the mapping between the subconversation and the parent conversation
+            subconversationGroupIdStore_1.subconversationGroupIdStore.storeGroupId(conversationId, subconversationId, subconversationGroupId);
+            return { groupId: subconversationGroupId, epoch };
+        }
+        catch (error) {
+            if (shouldRetry) {
+                return this.joinConferenceSubconversation(conversationId, false);
+            }
+            throw error;
+        }
+    }
+    /**
+     * Will leave conference subconversation if it's known by client and established.
+     *
+     * @param conversationId Id of the parent conversation which subconversation we want to leave
+     */
+    async leaveConferenceSubconversation(conversationId) {
+        const subconversationGroupId = subconversationGroupIdStore_1.subconversationGroupIdStore.getGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+        if (!subconversationGroupId) {
+            return;
+        }
+        const doesGroupExistLocally = await this.mlsService.conversationExists(subconversationGroupId);
+        if (!doesGroupExistLocally) {
+            // If the subconversation was known by a client but is does not exist locally, we can remove it from the store.
+            return subconversationGroupIdStore_1.subconversationGroupIdStore.removeGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+        }
+        try {
+            await this.apiClient.api.conversation.deleteSubconversationSelf(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+        }
+        catch (error) {
+            this.logger.error(`Failed to leave conference subconversation:`, error);
+        }
+        await this.mlsService.wipeConversation(subconversationGroupId);
+        // once we've left the subconversation, we can remove it from the store
+        subconversationGroupIdStore_1.subconversationGroupIdStore.removeGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+    }
+    async leaveStaleConferenceSubconversations() {
+        const conversationIds = subconversationGroupIdStore_1.subconversationGroupIdStore.getAllGroupIdsBySubconversationId(conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+        for (const { parentConversationId } of conversationIds) {
+            await this.leaveConferenceSubconversation(parentConversationId);
+        }
+    }
+    async getSubconversationEpochInfo(conversationId, shouldAdvanceEpoch = false) {
+        const subconversationGroupId = await this.mlsService.getGroupIdFromConversationId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+        const parentGroupId = await this.mlsService.getGroupIdFromConversationId(conversationId);
+        // this method should not be called if the subconversation (and its parent conversation) is not established
+        if (!subconversationGroupId || !parentGroupId) {
+            this.logger.error(`Could not obtain epoch info for conference subconversation of conversation ${JSON.stringify(conversationId)}: parent or subconversation group ID is missing`);
+            return null;
+        }
+        //we don't want to react to avs callbacks when conversation was not yet established
+        const doesMLSGroupExist = await this.mlsService.conversationExists(subconversationGroupId);
+        if (!doesMLSGroupExist) {
+            return null;
+        }
+        const members = await this.generateSubconversationMembers(subconversationGroupId, parentGroupId);
+        if (shouldAdvanceEpoch) {
+            await this.mlsService.renewKeyMaterial(subconversationGroupId);
+        }
+        const epoch = Number(await this.mlsService.getEpoch(subconversationGroupId));
+        const secretKey = await this.mlsService.exportSecretKey(subconversationGroupId, MLS_CONVERSATION_KEY_LENGTH);
+        return { members, epoch, keyLength: MLS_CONVERSATION_KEY_LENGTH, secretKey };
+    }
+    async subscribeToEpochUpdates(conversationId, findConversationByGroupId, onEpochUpdate) {
+        const { epoch: initialEpoch, groupId: subconversationGroupId } = await this.joinConferenceSubconversation(conversationId);
+        const forwardNewEpoch = async ({ groupId, epoch }) => {
+            var _a, _b;
+            if (groupId !== subconversationGroupId) {
+                // if the epoch update did not happen in the subconversation directly, check if it happened in the parent conversation
+                const parentConversationId = findConversationByGroupId(groupId);
+                if (!parentConversationId) {
+                    return;
+                }
+                const foundSubconversationGroupId = await ((_b = (_a = this.mlsService).getGroupIdFromConversationId) === null || _b === void 0 ? void 0 : _b.call(_a, parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE));
+                // if the conference subconversation of parent conversation is not known, ignore the epoch update
+                if (foundSubconversationGroupId !== subconversationGroupId) {
+                    return;
+                }
+            }
+            const subconversationEpochInfo = await this.getSubconversationEpochInfo(conversationId);
+            if (!subconversationEpochInfo) {
+                return;
+            }
+            return onEpochUpdate(Object.assign(Object.assign({}, subconversationEpochInfo), { epoch: Number(epoch) }));
+        };
+        this.mlsService.on('newEpoch', forwardNewEpoch);
+        await forwardNewEpoch({ groupId: subconversationGroupId, epoch: initialEpoch });
+        return () => this.mlsService.off('newEpoch', forwardNewEpoch);
+    }
+    async removeClientFromConferenceSubconversation(conversationId, clientToRemove) {
+        const subconversationGroupId = await this.mlsService.getGroupIdFromConversationId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+        if (!subconversationGroupId) {
+            return;
+        }
+        const doesMLSGroupExist = await this.mlsService.conversationExists(subconversationGroupId);
+        if (!doesMLSGroupExist) {
+            return;
+        }
+        const { user: { id: userId, domain }, clientId, } = clientToRemove;
+        const clientToRemoveQualifiedId = (0, fullyQualifiedClientIdUtils_1.constructFullyQualifiedClientId)(userId, clientId, domain);
+        const subconversationMembers = await this.mlsService.getClientIds(subconversationGroupId);
+        const isSubconversationMember = subconversationMembers.some(({ userId, clientId, domain }) => (0, fullyQualifiedClientIdUtils_1.constructFullyQualifiedClientId)(userId, clientId, domain) === clientToRemoveQualifiedId);
+        if (!isSubconversationMember) {
+            return;
+        }
+        return void this.mlsService.removeClientsFromConversation(subconversationGroupId, [clientToRemoveQualifiedId]);
+    }
+    async joinSubconversationByExternalCommit(conversationId, subconversation) {
+        await this.mlsService.joinByExternalCommit(() => this.apiClient.api.conversation.getSubconversationGroupInfo(conversationId, subconversation));
+    }
+    async getConferenceSubconversation(conversationId) {
+        return this.apiClient.api.conversation.getSubconversation(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+    }
+    async deleteConferenceSubconversation(conversationId, data) {
+        return this.apiClient.api.conversation.deleteSubconversation(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, data);
+    }
+    async generateSubconversationMembers(subconversationGroupId, parentGroupId) {
+        const subconversationMemberIds = await this.mlsService.getClientIds(subconversationGroupId);
+        const parentMemberIds = await this.mlsService.getClientIds(parentGroupId);
+        return parentMemberIds.map(parentMember => {
+            const isSubconversationMember = subconversationMemberIds.some(({ userId, clientId, domain }) => (0, fullyQualifiedClientIdUtils_1.constructFullyQualifiedClientId)(userId, clientId, domain) ===
+                (0, fullyQualifiedClientIdUtils_1.constructFullyQualifiedClientId)(parentMember.userId, parentMember.clientId, parentMember.domain));
+            return {
+                userid: `${parentMember.userId}@${parentMember.domain}`,
+                clientid: parentMember.clientId,
+                in_subconv: isSubconversationMember,
+            };
+        });
+    }
+}
+exports.SubconversationService = SubconversationService;

package/lib/conversation/SubconversationService/SubconversationService.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=SubconversationService.test.d.ts.map

package/lib/conversation/SubconversationService/SubconversationService.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SubconversationService.test.d.ts","sourceRoot":"","sources":["../../../src/conversation/SubconversationService/SubconversationService.test.ts"],"names":[],"mappings":""}

package/lib/conversation/SubconversationService/SubconversationService.test.js

@@ -0,0 +1,390 @@
+"use strict";
+/*
+ * Wire
+ * Copyright (C) 2023 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 });
+const conversation_1 = require("@wireapp/api-client/lib/conversation");
+const http_1 = require("@wireapp/api-client/lib/http");
+const api_client_1 = require("@wireapp/api-client");
+const SubconversationService_1 = require("./SubconversationService");
+const subconversationGroupIdStore_1 = require("../../messagingProtocols/mls/MLSService/stores/subconversationGroupIdStore/subconversationGroupIdStore");
+const fullyQualifiedClientIdUtils_1 = require("../../util/fullyQualifiedClientIdUtils");
+const getSubconversationResponse = ({ epoch, epochTimestamp, parentConversationId, groupId, members = [], subconversationId = conversation_1.SUBCONVERSATION_ID.CONFERENCE, }) => {
+    return {
+        cipher_suite: 1,
+        epoch,
+        parent_qualified_id: parentConversationId,
+        group_id: groupId,
+        members,
+        subconv_id: subconversationId,
+        epoch_timestamp: epochTimestamp,
+    };
+};
+const buildSubconversationService = () => {
+    const apiClient = new api_client_1.APIClient({ urls: api_client_1.APIClient.BACKEND.STAGING });
+    const mlsService = {
+        conversationExists: jest.fn(),
+        wipeConversation: jest.fn(),
+        registerConversation: jest.fn(),
+        getEpoch: jest.fn(),
+        joinByExternalCommit: jest.fn(),
+        getGroupIdFromConversationId: jest.fn(),
+        exportSecretKey: jest.fn(),
+        getClientIds: jest.fn(),
+        renewKeyMaterial: jest.fn(),
+        on: jest.fn(),
+        off: jest.fn(),
+        removeClientsFromConversation: jest.fn(),
+    };
+    const subconversationService = new SubconversationService_1.SubconversationService(apiClient, mlsService);
+    return [subconversationService, { apiClient, mlsService }];
+};
+describe('SubconversationService', () => {
+    describe('joinConferenceSubconversation', () => {
+        afterEach(() => {
+            jest.useRealTimers();
+            jest.clearAllMocks();
+        });
+        it('wipes group locally (if it exists) before registering a group if remote epoch is equal 0', async () => {
+            const [subconversationService, { apiClient, mlsService }] = buildSubconversationService();
+            const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            const subconversationGroupId = 'subconversationGroupId';
+            const subconversationResponse = getSubconversationResponse({
+                epoch: 0,
+                epochTimestamp: '',
+                parentConversationId,
+                groupId: subconversationGroupId,
+                subconversationId: conversation_1.SUBCONVERSATION_ID.CONFERENCE,
+            });
+            jest.spyOn(apiClient.api.conversation, 'getSubconversation').mockResolvedValueOnce(subconversationResponse);
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
+            await subconversationService.joinConferenceSubconversation(parentConversationId);
+            expect(mlsService.wipeConversation).toHaveBeenCalledWith(subconversationGroupId);
+            expect(mlsService.registerConversation).toHaveBeenCalledWith(subconversationGroupId, []);
+        });
+        it('registers a group if remote epoch is 0 and group does not exist locally', async () => {
+            const [subconversationService, { apiClient, mlsService }] = buildSubconversationService();
+            const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            const subconversationGroupId = 'subconversationGroupId';
+            const subconversationResponse = getSubconversationResponse({
+                epoch: 0,
+                epochTimestamp: '',
+                parentConversationId,
+                groupId: subconversationGroupId,
+                subconversationId: conversation_1.SUBCONVERSATION_ID.CONFERENCE,
+            });
+            jest.spyOn(apiClient.api.conversation, 'getSubconversation').mockResolvedValueOnce(subconversationResponse);
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(false);
+            await subconversationService.joinConferenceSubconversation(parentConversationId);
+            expect(mlsService.wipeConversation).not.toHaveBeenCalled();
+            expect(mlsService.registerConversation).toHaveBeenCalledWith(subconversationGroupId, []);
+        });
+        it('deletes conference subconversation from backend if group is already established and epoch is older than one day, then rejoins', async () => {
+            jest.useFakeTimers();
+            const [subconversationService, { apiClient, mlsService }] = buildSubconversationService();
+            const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            const subconversationGroupId = 'subconversationGroupId';
+            const initialSubconversationEpoch = 1;
+            const currentTimeISO = '2023-10-24T12:00:00.000Z';
+            jest.setSystemTime(new Date(currentTimeISO));
+            jest.spyOn(apiClient.api.conversation, 'deleteSubconversation').mockResolvedValueOnce();
+            // epoch time is older than 24h
+            const epochTimestamp = '2023-10-23T11:00:00.000Z';
+            const subconversationResponse = getSubconversationResponse({
+                epoch: initialSubconversationEpoch,
+                epochTimestamp: epochTimestamp,
+                parentConversationId,
+                groupId: subconversationGroupId,
+                subconversationId: conversation_1.SUBCONVERSATION_ID.CONFERENCE,
+            });
+            jest.spyOn(apiClient.api.conversation, 'getSubconversation').mockResolvedValueOnce(subconversationResponse);
+            // After deletion, epoch is 0
+            const subconversationEpochAfterDeletion = 0;
+            const subconversationResponse2 = getSubconversationResponse({
+                epoch: subconversationEpochAfterDeletion,
+                epochTimestamp: epochTimestamp,
+                parentConversationId,
+                groupId: subconversationGroupId,
+                subconversationId: conversation_1.SUBCONVERSATION_ID.CONFERENCE,
+            });
+            jest.spyOn(apiClient.api.conversation, 'getSubconversation').mockResolvedValueOnce(subconversationResponse2);
+            await subconversationService.joinConferenceSubconversation(parentConversationId);
+            expect(apiClient.api.conversation.deleteSubconversation).toHaveBeenCalledWith(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, {
+                groupId: subconversationGroupId,
+                epoch: initialSubconversationEpoch,
+            });
+            expect(mlsService.registerConversation).toHaveBeenCalledTimes(1);
+            expect(mlsService.wipeConversation).toHaveBeenCalledWith(subconversationGroupId);
+        });
+        it('joins conference subconversation with external commit if group is already established and epoch is younger than one day', async () => {
+            jest.useFakeTimers();
+            const [subconversationService, { apiClient, mlsService }] = buildSubconversationService();
+            const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            const subconversationGroupId = 'subconversationGroupId';
+            const subconversationEpoch = 1;
+            const currentTimeISO = '2023-10-24T12:00:00.000Z';
+            jest.setSystemTime(new Date(currentTimeISO));
+            jest.spyOn(apiClient.api.conversation, 'deleteSubconversation').mockResolvedValueOnce();
+            // epoch time is younger than 24h
+            const epochTimestamp = '2023-10-23T13:00:00.000Z';
+            const subconversationResponse = getSubconversationResponse({
+                epoch: subconversationEpoch,
+                epochTimestamp: epochTimestamp,
+                parentConversationId,
+                groupId: subconversationGroupId,
+                subconversationId: conversation_1.SUBCONVERSATION_ID.CONFERENCE,
+            });
+            jest.spyOn(apiClient.api.conversation, 'getSubconversation').mockResolvedValueOnce(subconversationResponse);
+            await subconversationService.joinConferenceSubconversation(parentConversationId);
+            expect(apiClient.api.conversation.deleteSubconversation).not.toHaveBeenCalled();
+            expect(mlsService.registerConversation).not.toHaveBeenCalled();
+            expect(mlsService.wipeConversation).not.toHaveBeenCalled();
+            expect(mlsService.joinByExternalCommit).toHaveBeenCalled();
+        });
+        it('retries to join if registering a conversations throws an error', async () => {
+            const [subconversationService, { apiClient, mlsService }] = buildSubconversationService();
+            const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            const subconversationGroupId = 'subconversationGroupId';
+            const subconversationResponse = getSubconversationResponse({
+                epoch: 0,
+                epochTimestamp: '',
+                parentConversationId,
+                groupId: subconversationGroupId,
+                subconversationId: conversation_1.SUBCONVERSATION_ID.CONFERENCE,
+            });
+            jest.spyOn(apiClient.api.conversation, 'getSubconversation').mockResolvedValue(subconversationResponse);
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(false);
+            jest
+                .spyOn(mlsService, 'registerConversation')
+                .mockRejectedValueOnce(new http_1.BackendError('', http_1.BackendErrorLabel.MLS_STALE_MESSAGE, http_1.StatusCode.CONFLICT));
+            await subconversationService.joinConferenceSubconversation(parentConversationId);
+            expect(mlsService.wipeConversation).not.toHaveBeenCalled();
+            expect(mlsService.registerConversation).toHaveBeenCalledWith(subconversationGroupId, []);
+            expect(mlsService.registerConversation).toHaveBeenCalledTimes(2);
+        });
+        it('returns fresh epoch number after joining the group', async () => {
+            const [subconversationService, { apiClient, mlsService }] = buildSubconversationService();
+            const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            const subconversationGroupId = 'subconversationGroupId';
+            const subconversationResponse = getSubconversationResponse({
+                epoch: 0,
+                epochTimestamp: '',
+                parentConversationId,
+                groupId: subconversationGroupId,
+                subconversationId: conversation_1.SUBCONVERSATION_ID.CONFERENCE,
+            });
+            jest.spyOn(apiClient.api.conversation, 'getSubconversation').mockResolvedValueOnce(subconversationResponse);
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(false);
+            const updatedEpoch = 1;
+            jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(updatedEpoch);
+            const response = await subconversationService.joinConferenceSubconversation(parentConversationId);
+            expect(mlsService.wipeConversation).not.toHaveBeenCalled();
+            expect(mlsService.registerConversation).toHaveBeenCalledWith(subconversationGroupId, []);
+            expect(response).toEqual({ epoch: updatedEpoch, groupId: subconversationGroupId });
+        });
+    });
+    describe('leaveConferenceSubconversation', () => {
+        it('does nothing if subconversation id is not found in the store', async () => {
+            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            await subconversationService.leaveConferenceSubconversation(parentConversationId);
+            expect(mlsService.wipeConversation).not.toHaveBeenCalled();
+        });
+        it('removes subconversation id from the store if conversations was known but not established locally', async () => {
+            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            const subconversationGroupId = 'subconversationGroupId';
+            subconversationGroupIdStore_1.subconversationGroupIdStore.storeGroupId(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, subconversationGroupId);
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(false);
+            await subconversationService.leaveConferenceSubconversation(parentConversationId);
+            const groupId = subconversationGroupIdStore_1.subconversationGroupIdStore.getGroupId(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+            expect(groupId).toEqual(undefined);
+            expect(mlsService.wipeConversation).not.toHaveBeenCalled();
+        });
+        it('deletes self client from conference subconversation', async () => {
+            const [subconversationService, { apiClient, mlsService }] = buildSubconversationService();
+            const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            const subconversationGroupId = 'subconversationGroupId';
+            subconversationGroupIdStore_1.subconversationGroupIdStore.storeGroupId(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, subconversationGroupId);
+            jest.spyOn(apiClient.api.conversation, 'deleteSubconversationSelf');
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
+            await subconversationService.leaveConferenceSubconversation(parentConversationId);
+            const groupId = subconversationGroupIdStore_1.subconversationGroupIdStore.getGroupId(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+            expect(groupId).toEqual(undefined);
+            expect(apiClient.api.conversation.deleteSubconversationSelf).toHaveBeenCalledWith(parentConversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
+            expect(mlsService.wipeConversation).toHaveBeenCalledWith(subconversationGroupId);
+        });
+    });
+    describe('getSubconversationEpochInfo', () => {
+        it('returns null if subconversation id is not known by a client', async () => {
+            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            jest.spyOn(mlsService, 'getGroupIdFromConversationId').mockResolvedValue(undefined);
+            const response = await subconversationService.getSubconversationEpochInfo(parentConversationId);
+            expect(response).toEqual(null);
+        });
+        it('returns null if MLS group for subconversation does not exist locally', async () => {
+            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            const parentConversationGroupId = 'parentConversationGroupId';
+            const subconversationGroupId = 'subconversationGroupId';
+            jest
+                .spyOn(mlsService, 'getGroupIdFromConversationId')
+                .mockImplementation(async (_conversationId, subconverstionId) => {
+                if (subconverstionId) {
+                    return subconversationGroupId;
+                }
+                return parentConversationGroupId;
+            });
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(false);
+            const response = await subconversationService.getSubconversationEpochInfo(parentConversationId);
+            expect(response).toEqual(null);
+        });
+        it('returns epoch info and advances epoch number', async () => {
+            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            const parentConversationGroupId = 'parentConversationGroupId';
+            const subconversationGroupId = 'subconversationGroupId';
+            jest
+                .spyOn(mlsService, 'getGroupIdFromConversationId')
+                .mockImplementation(async (_conversationId, subconverstionId) => {
+                if (subconverstionId) {
+                    return subconversationGroupId;
+                }
+                return parentConversationGroupId;
+            });
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValueOnce(true);
+            const mockedEpoch = 2;
+            jest.spyOn(mlsService, 'getEpoch').mockResolvedValueOnce(mockedEpoch);
+            const mockedSecretKey = 'mockedSecretKey';
+            jest.spyOn(mlsService, 'exportSecretKey').mockResolvedValueOnce(mockedSecretKey);
+            const subconversationMemberIds = [{ userId: 'userId1', clientId: 'clientId1', domain: 'domain' }];
+            const parentConversationMemberIds = [
+                { userId: 'userId1', clientId: 'clientId1', domain: 'domain' },
+                { userId: 'userId2', clientId: 'clientId2', domain: 'domain' },
+            ];
+            jest.spyOn(mlsService, 'getClientIds').mockImplementation(async (groupId) => {
+                if (groupId === parentConversationGroupId) {
+                    return parentConversationMemberIds;
+                }
+                return subconversationMemberIds;
+            });
+            const response = await subconversationService.getSubconversationEpochInfo(parentConversationId, true);
+            const expected = {
+                epoch: mockedEpoch,
+                keyLength: 32,
+                members: [
+                    { clientid: 'clientId1', in_subconv: true, userid: 'userId1@domain' },
+                    { clientid: 'clientId2', in_subconv: false, userid: 'userId2@domain' },
+                ],
+                secretKey: mockedSecretKey,
+            };
+            expect(response).toEqual(expected);
+            expect(mlsService.renewKeyMaterial).toHaveBeenCalledWith(subconversationGroupId);
+        });
+    });
+    describe('subscribeToEpochUpdates', () => {
+        it('should subscribe to newEpoch event', async () => {
+            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            const parentConversationGroupId = 'parentConversationGroupId';
+            const subconversationGroupId = 'subconversationGroupId';
+            const mockedInitialEpoch = 1;
+            jest.spyOn(mlsService, 'getGroupIdFromConversationId').mockResolvedValue(subconversationGroupId);
+            const mockedEpochInfo = { epoch: mockedInitialEpoch, keyLength: 32, members: [], secretKey: '' };
+            jest.spyOn(subconversationService, 'getSubconversationEpochInfo').mockResolvedValueOnce(mockedEpochInfo);
+            jest
+                .spyOn(subconversationService, 'joinConferenceSubconversation')
+                .mockResolvedValue({ epoch: mockedInitialEpoch, groupId: subconversationGroupId });
+            const findConversationByGroupId = (groupId) => {
+                if (groupId === parentConversationGroupId) {
+                    return parentConversationId;
+                }
+                return undefined;
+            };
+            const onEpochUpdateCallback = jest.fn();
+            const unsubscribe = await subconversationService.subscribeToEpochUpdates(parentConversationId, findConversationByGroupId, onEpochUpdateCallback);
+            expect(mlsService.on).toHaveBeenCalledWith('newEpoch', expect.any(Function));
+            expect(subconversationService.getSubconversationEpochInfo).toHaveBeenCalledWith(parentConversationId);
+            expect(onEpochUpdateCallback).toHaveBeenCalledWith(mockedEpochInfo);
+            unsubscribe();
+            expect(mlsService.off).toHaveBeenCalledWith('newEpoch', expect.any(Function));
+        });
+    });
+    describe('removeClientFromConferenceSubconversation', () => {
+        it('does nothing if subconversation group is not known', async () => {
+            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            jest.spyOn(mlsService, 'getGroupIdFromConversationId').mockResolvedValue(undefined);
+            const user = { id: 'userId', domain: 'domain' };
+            const clientId = 'clientId';
+            const clientToRemove = { user, clientId };
+            await subconversationService.removeClientFromConferenceSubconversation(parentConversationId, clientToRemove);
+            expect(mlsService.removeClientsFromConversation).not.toHaveBeenCalled();
+        });
+        it('does nothing if subconversation group is not established', async () => {
+            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            const subconversationGroupId = 'subconversationGroupId';
+            jest.spyOn(mlsService, 'getGroupIdFromConversationId').mockResolvedValue(subconversationGroupId);
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValue(false);
+            const user = { id: 'userId', domain: 'domain' };
+            const clientId = 'clientId';
+            const clientToRemove = { user, clientId };
+            await subconversationService.removeClientFromConferenceSubconversation(parentConversationId, clientToRemove);
+            expect(mlsService.removeClientsFromConversation).not.toHaveBeenCalled();
+        });
+        it('does nothing if client is not a subconversation group member', async () => {
+            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            const subconversationGroupId = 'subconversationGroupId';
+            jest.spyOn(mlsService, 'getGroupIdFromConversationId').mockResolvedValue(subconversationGroupId);
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValue(true);
+            const subconversationMemberIds = [
+                { userId: 'userId1', clientId: 'clientId1', domain: 'domain' },
+                { userId: 'userId2', clientId: 'clientId2', domain: 'domain2' },
+            ];
+            jest.spyOn(mlsService, 'getClientIds').mockResolvedValueOnce(subconversationMemberIds);
+            const user = { id: 'userId3', domain: 'domain3' };
+            const clientId = 'clientId3';
+            const clientToRemove = { user, clientId };
+            await subconversationService.removeClientFromConferenceSubconversation(parentConversationId, clientToRemove);
+            expect(mlsService.removeClientsFromConversation).not.toHaveBeenCalled();
+        });
+        it('removes client from subconversation group', async () => {
+            const [subconversationService, { mlsService }] = buildSubconversationService();
+            const parentConversationId = { id: 'parentConversationId', domain: 'domain' };
+            const subconversationGroupId = 'subconversationGroupId';
+            jest.spyOn(mlsService, 'getGroupIdFromConversationId').mockResolvedValue(subconversationGroupId);
+            jest.spyOn(mlsService, 'conversationExists').mockResolvedValue(true);
+            const user = { id: 'userId3', domain: 'domain3' };
+            const clientId = 'clientId3';
+            const clientToRemove = { user, clientId };
+            const subconversationMemberIds = [
+                { userId: 'userId1', clientId: 'clientId1', domain: 'domain' },
+                { userId: 'userId2', clientId: 'clientId2', domain: 'domain2' },
+                { userId: clientToRemove.user.id, clientId: clientToRemove.clientId, domain: clientToRemove.user.domain },
+            ];
+            jest.spyOn(mlsService, 'getClientIds').mockResolvedValueOnce(subconversationMemberIds);
+            await subconversationService.removeClientFromConferenceSubconversation(parentConversationId, clientToRemove);
+            expect(mlsService.removeClientsFromConversation).toHaveBeenCalledWith(subconversationGroupId, [
+                (0, fullyQualifiedClientIdUtils_1.constructFullyQualifiedClientId)(clientToRemove.user.id, clientToRemove.clientId, clientToRemove.user.domain),
+            ]);
+        });
+    });
+});

package/lib/messagingProtocols/mls/MLSService/MLSService.d.ts

@@ -1,6 +1,5 @@
 import type { RegisteredClient } from '@wireapp/api-client/lib/client';
 import { PostMlsMessageResponse, SUBCONVERSATION_ID } from '@wireapp/api-client/lib/conversation';
-import { Subconversation } from '@wireapp/api-client/lib/conversation/Subconversation';
 import { ConversationMLSMessageAddEvent, ConversationMLSWelcomeEvent } from '@wireapp/api-client/lib/event';
 import { QualifiedId } from '@wireapp/api-client/lib/user';
 import logdown from 'logdown';
@@ -20,11 +19,6 @@ interface LocalMLSServiceConfig extends MLSServiceConfig {
      */
     minRequiredNumberOfAvailableKeyPackages: number;
 }
-export interface SubconversationEpochInfoMember {
-    userid: string;
-    clientid: ClientId;
-    in_subconv: boolean;
-}
 type Events = {
     newEpoch: {
         epoch: number;
@@ -60,25 +54,6 @@ export declare class MLSService extends TypedEventEmitter<Events> {
     getEpoch(groupId: string | Uint8Array): Promise<number>;
     newProposal(proposalType: ProposalType, args: ProposalArgs | AddProposalArgs | RemoveProposalArgs): Promise<import("@wireapp/core-crypto").ProposalBundle>;
     joinByExternalCommit(getGroupInfo: () => Promise<Uint8Array>): Promise<PostMlsMessageResponse>;
-    getConferenceSubconversation(conversationId: QualifiedId): Promise<Subconversation>;
-    private deleteConferenceSubconversation;
-    /**
-     * Will leave conference subconversation if it's known by client and established.
-     *
-     * @param conversationId Id of the parent conversation which subconversation we want to leave
-     */
-    leaveConferenceSubconversation(conversationId: QualifiedId): Promise<void>;
-    leaveStaleConferenceSubconversations(): Promise<void>;
-    /**
-     * Will join or register an mls subconversation for conference calls.
-     * Will return the secret key derived from the subconversation
-     *
-     * @param conversationId Id of the parent conversation in which the call should happen
-     */
-    joinConferenceSubconversation(conversationId: QualifiedId): Promise<{
-        groupId: string;
-        epoch: number;
-    }>;
     exportSecretKey(groupId: string, keyLength: number): Promise<string>;
     newExternalProposal(externalProposalType: ExternalProposalType, args: ExternalAddProposalArgs): Promise<Uint8Array>;
     processWelcomeMessage(welcomeMessage: Uint8Array): Promise<ConversationId>;

package/lib/messagingProtocols/mls/MLSService/MLSService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MLSService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"MLSService.d.ts","sourceRoot":"","sources":["../../../../src/messagingProtocols/mls/MLSService/MLSService.ts"],"names":[],"mappings":"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"}

package/lib/messagingProtocols/mls/MLSService/MLSService.js

@@ -33,9 +33,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MLSService = exports.optionalToUint8Array = void 0;
-const conversation_1 = require("@wireapp/api-client/lib/conversation");
 const http_1 = require("@wireapp/api-client/lib/http");
-const TimeUtil_1 = require("@wireapp/commons/lib/util/TimeUtil");
 const bazinga64_1 = require("bazinga64");
 const logdown_1 = __importDefault(require("logdown"));
 const commons_1 = require("@wireapp/commons");
@@ -239,74 +237,6 @@ class MLSService extends commons_1.TypedEventEmitter {
         }
         return mlsResponse;
     }
-    async getConferenceSubconversation(conversationId) {
-        return this.apiClient.api.conversation.getSubconversation(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
-    }
-    async deleteConferenceSubconversation(conversationId, data) {
-        return this.apiClient.api.conversation.deleteSubconversation(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE, data);
-    }
-    /**
-     * Will leave conference subconversation if it's known by client and established.
-     *
-     * @param conversationId Id of the parent conversation which subconversation we want to leave
-     */
-    async leaveConferenceSubconversation(conversationId) {
-        const subconversationGroupId = subconversationGroupIdStore_1.subconversationGroupIdStore.getGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
-        if (!subconversationGroupId) {
-            return;
-        }
-        const isSubconversationEstablished = await this.conversationExists(subconversationGroupId);
-        if (!isSubconversationEstablished) {
-            // if the subconversation was known by a client but is not established anymore, we can remove it from the store
-            return subconversationGroupIdStore_1.subconversationGroupIdStore.removeGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
-        }
-        try {
-            await this.apiClient.api.conversation.deleteSubconversationSelf(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
-        }
-        catch (error) {
-            this.logger.error(`Failed to leave conference subconversation:`, error);
-        }
-        await this.wipeConversation(subconversationGroupId);
-        // once we've left the subconversation, we can remove it from the store
-        subconversationGroupIdStore_1.subconversationGroupIdStore.removeGroupId(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE);
-    }
-    async leaveStaleConferenceSubconversations() {
-        const conversationIds = subconversationGroupIdStore_1.subconversationGroupIdStore.getAllGroupIdsBySubconversationId(conversation_1.SUBCONVERSATION_ID.CONFERENCE);
-        for (const { parentConversationId } of conversationIds) {
-            await this.leaveConferenceSubconversation(parentConversationId);
-        }
-    }
-    /**
-     * Will join or register an mls subconversation for conference calls.
-     * Will return the secret key derived from the subconversation
-     *
-     * @param conversationId Id of the parent conversation in which the call should happen
-     */
-    async joinConferenceSubconversation(conversationId) {
-        const subconversation = await this.getConferenceSubconversation(conversationId);
-        if (subconversation.epoch === 0) {
-            // if subconversation is not yet established, create it
-            await this.registerConversation(subconversation.group_id, []);
-        }
-        else {
-            const epochUpdateTime = new Date(subconversation.epoch_timestamp).getTime();
-            const epochAge = new Date().getTime() - epochUpdateTime;
-            if (epochAge > TimeUtil_1.TimeInMillis.DAY) {
-                // if subconversation does exist, but it's older than 24h, delete and re-join
-                await this.deleteConferenceSubconversation(conversationId, {
-                    groupId: subconversation.group_id,
-                    epoch: subconversation.epoch,
-                });
-                await this.wipeConversation(subconversation.group_id);
-                return this.joinConferenceSubconversation(conversationId);
-            }
-            await this.joinByExternalCommit(() => this.apiClient.api.conversation.getSubconversationGroupInfo(conversationId, conversation_1.SUBCONVERSATION_ID.CONFERENCE));
-        }
-        const epoch = Number(await this.getEpoch(subconversation.group_id));
-        // We store the mapping between the subconversation and the parent conversation
-        subconversationGroupIdStore_1.subconversationGroupIdStore.storeGroupId(conversationId, subconversation.subconv_id, subconversation.group_id);
-        return { groupId: subconversation.group_id, epoch };
-    }
     async exportSecretKey(groupId, keyLength) {
         const groupIdBytes = bazinga64_1.Decoder.fromBase64(groupId).asBytes;
         const key = await this.coreCryptoClient.exportSecretKey(groupIdBytes, keyLength);

package/package.json

@@ -61,6 +61,6 @@
     "test:coverage": "jest --coverage",
     "watch": "tsc --watch"
   },
-  "version": "42.19.0",
-  "gitHead": "5ecc27e935400844c53aa6164210cb4f9846a1dd"
+  "version": "42.19.1",
+  "gitHead": "278e386599ad8b55a532765615287adf51b1c189"
 }